Improve data download and process workflow

.github/workflows/actions.yml

@@ -1,4 +1,4 @@
-name: Run Makefile with Selenium
+name: Run Makefile
 
 on:
   # Schedule to run on the 1st day of each month
@@ -26,40 +26,18 @@ jobs:
     - name: Check out repository
       uses: actions/checkout@v3
 
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.12'
-
-    - name: Install Python dependencies
-      run: |
-        python -m venv venv
-        source venv/bin/activate
-        pip install --upgrade pip
-        pip install -r scripts/requirements.txt
-
-    - name: Install Xvfb and dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y xvfb
-        sudo apt-get install -y chromium-browser
-
     - name: Install GDAL (ogr2ogr)
       run: |
         sudo apt-get update
         sudo apt-get install -y gdal-bin
         ogr2ogr --version
 
-    - name: Run Makefile with Xvfb
+    - name: Run Makefile
       run: |
-        Xvfb :99 -screen 0 1024x768x24 &
-        export DISPLAY=:99
-        source venv/bin/activate   
-        make all                
+        make data                
 
     - name: Run Make Clean
       run: |
-        source venv/bin/activate  
         make clean          
 
     - name: Push and Commit      
@@ -70,4 +48,4 @@ jobs:
       run: |
         git config --global user.email "${{env.CI_COMMIT_EMAIL}}"
         git config --global user.name "${{env.CI_COMMIT_NAME}}"
-        git diff --quiet && echo "No changes to commit" || (git add data/country-codes.csv && git commit -m "${{env.CI_COMMIT_MESSAGE}}" && git push)
+        git diff --quiet && echo "No changes to commit" || (git add data/countries.geojson && git commit -m "${{env.CI_COMMIT_MESSAGE}}" && git push)

Makefile

@@ -1,21 +1,9 @@
-VENV = venv
-PYTHON = $(VENV)/bin/python3
-PIP = $(VENV)/bin/pip
-EXTRACTED_DIR = extracted_files
-
 .PHONY: data clean
-
-all: data
-
-data: $(VENV)/bin/activate
-	$(PYTHON) scripts/process.py
-
-$(VENV)/bin/activate: scripts/requirements.txt
-	python3 -m venv $(VENV)
-	$(PIP) install -r scripts/requirements.txt
-
 clean:
-	rm -rf __pycache__
-	rm -rf $(VENV)
 	find . -maxdepth 1 -name "*.zip" -exec rm -f {} +
-	if [ -d $(EXTRACTED_DIR) ]; then rm -rf $(EXTRACTED_DIR); fi
+
+download:
+	if [ ! -f ne_10m_admin_0_countries.zip ]; then curl -L -o ne_10m_admin_0_countries.zip https://naciscdn.org/naturalearth/10m/cultural/ne_10m_admin_0_countries.zip; fi
+
+data: download
+	ogr2ogr -f GeoJSON -makevalid -lco COORDINATE_PRECISION=6 -sql "SELECT admin as name, iso_a3 as \"ISO3166-1-Alpha-3\", iso_a2 as \"ISO3166-1-Alpha-2\" FROM ne_10m_admin_0_countries" data/countries.geojson /vsizip/ne_10m_admin_0_countries.zip

README.md

@@ -9,18 +9,48 @@ Perfect for use in apps and visualizations.
 
 The data comes from [Natural Earth][naturalearth], a community effort to make visually pleasing, well-crafted maps with cartography or GIS software at small scale.
 
-The shape of the countries has two fields : 
-* name : the common name for the country
-* ISO3166-1-Alpha-3 : three letters iso code of the country
-
 More info about countries can be obtained from datapackage https://github.com/datasets/country-codes by a join on field ISO3166-1-Alpha-3
 
-[naturalearth]: http://www.naturalearthdata.com/
-[datapackage]: http://dataprotocols.org/data-packages/
+[naturalearth]: https://www.naturalearthdata.com/
+[datapackage]: https://datapackage.org/standard/data-package/
 
 ## Preparation
 
-To run the script in order to update the data : see [scripts README](scripts/README.md)
+To run the script and update the data:
+
+### Prerequisites
+
+1. Install required tools:
+   - [GDAL](https://gdal.org/en/latest/download.html) - for geographic data processing
+
+2. Verify GDAL installation:
+   ```bash
+   ogr2ogr --version
+   ```
+
+### Data Processing
+
+The project uses `ogr2ogr` to convert Natural Earth's country boundaries from Shapefile to GeoJSON format, with the following features:
+- Coordinate precision set to 6 decimal places
+- Geometry validation enabled (`-makevalid`):
+  - Fixes self-intersecting polygons
+  - Corrects ring orientation
+  - Removes duplicate vertices
+  - Ensures geometric validity for better compatibility with GIS tools
+- Selected fields:
+  - `name`: Common name of the country (from admin field)
+  - `ISO3166-1-Alpha-2`: Two-letter ISO country code (from iso_a2 field)
+  - `ISO3166-1-Alpha-3`: Three-letter ISO country code (from iso_a3 field)
+
+To process the data:
+  ```bash
+  make data
+  ```
+
+This will:
+1. Download the Natural Earth countries dataset
+2. Convert it to GeoJSON format with the specified settings
+3. Save the result in `data/countries.geojson`
 
 ## License
 
@@ -32,12 +62,7 @@ formally required a link back or credit to [Natural Earth][naturalearth], [Lexma
 All source code is licenced under the [MIT licence][mit].
 
 [mit]: https://opensource.org/licenses/MIT
-[naturalearth]: http://www.naturalearthdata.com/
-[pddl]: http://opendatacommons.org/licenses/pddl/1.0/
-[lexman]: http://github.com/lexman
-[okfn]: http://okfn.org/
-
-
-
-
-
+[naturalearth]: https://www.naturalearthdata.com/
+[pddl]: https://opendatacommons.org/licenses/pddl/1.0/
+[lexman]: https://github.com/lexman
+[okfn]: https://okfn.org/