c2cgeoportal-geoportal 2.6.0__py2.py3-none-any.whl → 2.8.1.180__py2.py3-none-any.whl

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml

@@ -0,0 +1,66 @@
+# This file can be renamed as `docker-compose.override.yaml` and uncomment the desired lines for
+# development. The file `docker-compose.override.yaml` is ignored by Git by default.
+
+version: '2.3'
+
+services:
+  geoportal:
+    user: root
+    # volumes:
+    # For Python project development.
+    # - ./geoportal/${PACKAGE}_geoportal:/app/${PACKAGE}_geoportal
+    # For Python c2cgeportal development.
+    # - ./../c2cgeoportal/commons/c2cgeoportal_commons:/opt/c2cgeoportal/commons/c2cgeoportal_commons
+    # - ./../c2cgeoportal/geoportal/c2cgeoportal_geoportal:/opt/c2cgeoportal/geoportal/c2cgeoportal_geoportal
+    # - ./../c2cgeoportal/admin/c2cgeoportal_admin:/opt/c2cgeoportal/admin/c2cgeoportal_admin
+    command:
+      - /usr/local/bin/pserve
+      - --reload
+      - c2c:///app/development.ini
+    environment:
+      - DEVELOPMENT=1
+      - C2C_SQL_PROFILER_ENABLED=1
+      - C2C_DEBUG_VIEW_ENABLED=1
+      # - PRINT_URL=http://print:8080/print/
+      - PYTHONWARNINGS=default::DeprecationWarning
+      - SQLALCHEMY_WARN_20=true
+      - C2CWSGIUTILS_FORCE_PROTO=https
+    ports:
+      - 5678:5678 # For remote debugging using Visual Studio Code
+
+  # Also uncomment the PRINT_URL in geoportal
+  # print:
+  #   extends:
+  #     file: docker-compose-lib.yaml
+  #     service: print
+  #   volumes_from:
+  #     - config:ro
+  #   environment:
+  #     - LOG_LEVEL=DEBUG
+
+  # qgisserver:
+  #   # volumes:
+  #   #   - './../c2cgeoportal/docker/qgisserver/geomapfish_qgisserver/:/var/www/plugins/geomapfish_qgisserver/'
+  #   #   - './../c2cgeoportal/commons/c2cgeoportal_commons:/opt/c2cgeoportal/commons/c2cgeoportal_commons/'
+  #   environment:
+  #     - QGIS_SERVER_LOG_LEVEL=0
+  #     - QGIS_CATCH_SEGV=1 # The result stack traces will be available in /var/log/qgis.log
+
+  tools:
+    volumes_from:
+      - config:rw
+  #
+  # For Javascript project development.
+  # The debug application will be available at ``https://<host>/<entry_point>/dev/<interface>.html``.
+  # webpack_dev_server:
+  #   # Uncomment these lines when you want to debug respectively the project js, ngeo js and/or the gmf contrib js.
+  #   # Adapt the path for ngeo / gmf contrib to point where you have checkouted the code.
+  #   # volumes:
+  #   #   - ./geoportal/${PACKAGE}_geoportal/static-ngeo:/app/${PACKAGE}_geoportal/static-ngeo
+  #   #   - ./../ngeo/src:/usr/lib/node_modules/ngeo/src
+  #   #   - ./../ngeo/contribs:/usr/lib/node_modules/ngeo/contribs
+  #   volumes_from:
+  #     - config:rw
+  #   extends:
+  #     file: docker-compose-lib.yaml
+  #     service: webpack_dev_server

c2cgeoportal_geoportal/scaffolds/create/{docker-compose.yaml → {{cookiecutter.project}}/docker-compose.yaml}

@@ -1,7 +1,9 @@
----
-# The project Docker compose file for development.
+# The project Docker compose file.
 
-version: '2.0'
+version: '2.3'
+
+volumes:
+  postgresql_data:
 
 services:
   config:
@@ -20,6 +22,7 @@ services:
     extends:
       file: docker-compose-lib.yaml
       service: mapserver
+
     volumes_from:
       - config:ro
     volumes:
@@ -32,12 +35,9 @@ services:
   ##   volumes_from:
   ##     - config:ro
   ##   environment:
-  ##     # Single QGIS project files
-  ##     - QGIS_PROJECT_FILE=/etc/qgisserver/project.qgz
-  ##     - GEOMAPFISH_OGCSERVER=<OGC server name>
-  ##     # Multiple QGIS project files
-  ##     - QGIS_PROJECT_FILE=
-  ##     - GEOMAPFISH_ACCESSCONTROL_CONFIG=/etc/qgisserver/accesscontrol_config.yaml
+  ##     - QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES=/etc/qgisserver/
+  ##     # Or
+  ##     - QGIS_SERVER_LANDING_PAGE_PROJECTS_PG_CONNECTIONS=...
 
   tinyows:
     extends:
@@ -52,7 +52,7 @@ services:
       file: docker-compose-lib.yaml
       service: redis
 
-  # To test OpenShift version
+  # To test Kubernetes version
   # redis_master:
   #   extends:
   #     file: docker-compose-lib.yaml
@@ -107,12 +107,17 @@ services:
     volumes_from:
       - config:ro
 
-  # Rich image for project development with e.-g. vim, tree, awscli, psql, ...
+  # Rich image for project development with e.-g. vim, psql, ...
   tools:
-    volumes_from:
-      - config:rw
-    volumes:
-      - .:/src
     extends:
       file: docker-compose-lib.yaml
       service: tools
+    volumes_from:
+      - config:ro
+
+  # db:
+  #   extends:
+  #     file: docker-compose-lib.yaml
+  #     service: db
+  #   volumes:
+  #     - postgresql_data:/var/lib/postgresql/data

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default

@@ -0,0 +1,101 @@
+# Default values for c2cgeoportal
+GEOMAPFISH_VERSION={{cookiecutter.geomapfish_version}}
+GEOMAPFISH_MAIN_VERSION={{cookiecutter.geomapfish_main_version}}
+GEOMAPFISH_MAIN_MINOR_VERSION={{cookiecutter.geomapfish_main_minor_version}}
+COMPOSE_PROJECT_NAME={{cookiecutter.package}}
+PACKAGE={{cookiecutter.package}}
+SRID={{cookiecutter.srid}}
+DOCKER_PORT=8484
+DOCKER_BASE=camptocamp/{{cookiecutter.package}}
+DOCKER_TAG=latest
+VISIBLE_WEB_HOST=localhost:8484
+VISIBLE_WEB_PROTOCOL=https
+VISIBLE_ENTRY_POINT=/
+DEVELOPMENT=False
+AUTHTKT_TIMEOUT=86400
+AUTHTKT_REISSUE_TIME=9000
+AUTHTKT_MAXAGE=86400
+AUTHTKT_SECRET={{cookiecutter.authtkt_secret}}
+AUTHTKT_COOKIENAME=auth_tkt_{{cookiecutter.package}}
+AUTHTKT_HTTP_ONLY=True
+AUTHTKT_SECURE=True
+AUTHTKT_SAMESITE=Lax
+BASICAUTH=False
+MUTUALIZED_PRINT_URL=mutualized-print.apps.openshift-ch-1.camptocamp.com
+# For internal print
+# DISABLE_LOCAL will be set to # on mutualize services to comment local configuration
+# DISABLE_MUTUALIZE is set to # locally to comment mutualize services
+DISABLE_MUTUALIZE=#
+DISABLE_LOCAL=
+# For backward compatibility
+DISABLE_MUTUALIZED_PRINT=#
+DISABLE_LOCAL_PRINT=
+# Set DISABLE_HAPROXY_LOGGING to # to disable logging
+DISABLE_HAPROXY_LOGGING=
+HAPROXY_LOGGING_OPTIONS="log global
+    option httplog
+    option dontlognull"
+
+GEOPORTAL_INTERNAL_URL=http://geoportal:8080
+GEOPORTAL_INTERNAL_HOST=geoportal
+GEOPORTAL_INTERNAL_PORT=8080
+TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
+TILECLOUDCHAIN_INTERNAL_HOST=tilecloudchain
+TILECLOUDCHAIN_INTERNAL_PORT=8080
+# For internal print
+MAPSERVER_URL=http://mapserver:8080/
+TINYOWS_URL=http://tinyows:8080/
+QGISSERVER_URL=http://qgisserver:8080/mapserv_proxy
+QGIS_VERSION=3.28-gdal3.7
+POSTGRES_TAG=13-postgis-3
+
+DEVSERVER_HOST=webpack_dev_server:8080
+REDIS_SERVICENAME=mymaster
+REDIS_DB=0
+REDIS_TIMEOUT=10
+C2C_REDIS_TIMEOUT=10
+C2C_REDIS_SERVICENAME=mymaster
+C2C_REDIS_DB=0
+PGOPTIONS=-c statement_timeout=30000
+SQLALCHEMY_POOL_RECYCLE=30
+SQLALCHEMY_POOL_SIZE=5
+SQLALCHEMY_MAX_OVERFLOW=25
+SQLALCHEMY_SLAVE_POOL_RECYCLE=30
+SQLALCHEMY_SLAVE_POOL_SIZE=5
+SQLALCHEMY_SLAVE_MAX_OVERFLOW=25
+CATALINA_OPTS=-Xmx1024m
+C2C_BROADCAST_PREFIX=broadcast_geoportal_
+LOG_LEVEL=INFO
+C2CGEOPORTAL_LOG_LEVEL=INFO
+SQL_LOG_LEVEL=WARN
+GUNICORN_LOG_LEVEL=WARN
+OTHER_LOG_LEVEL=WARN
+DOGPILECACHE_LOG_LEVEL=WARN
+C2CWSGI_LOG_LEVEL=WARN
+TILECLOUD_LOG_LEVEL=INFO
+TILECLOUD_CHAIN_LOG_LEVEL=INFO
+C2CWSGIUTILS_LOG_LEVEL=INFO
+LOG_TYPE=console
+
+# QGIS
+QGIS_LOG_LEVEL=INFO # For the plugin
+QGIS_SERVER_LOG_LEVEL=2
+CPL_VSIL_CURL_USE_CACHE=TRUE
+CPL_VSIL_CURL_CACHE_SIZE=128000000
+CPL_VSIL_CURL_USE_HEAD=FALSE
+GDAL_DISABLE_READDIR_ON_OPEN=TRUE
+QGIS_AUTH_DB_DIR_PATH=/etc/qgisserver/
+QGIS_SERVER_IGNORE_BAD_LAYERS=TRUE
+QGIS_SERVER_DISABLE_GETPRINT=TRUE
+PGSERVICEFILE=/etc/qgisserver/pg_service.conf
+QGIS_SERVER_TRUST_LAYER_METADATA=TRUE
+QGIS_SERVER_PARALLEL_RENDERING=FALSE
+MAX_CACHE_LAYERS=100
+QGIS_SERVER_CACHE_SIZE=60 # MB
+QGIS_SERVER_WMS_MAX_HEIGHT=5000
+QGIS_SERVER_WMS_MAX_WIDTH=5000
+QGIS_SERVER_API_WFS3_MAX_LIMIT=10000
+QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES=/etc/qgisserver/
+QGIS_SERVER_OVERRIDE_SYSTEM_LOCALE=fr
+
+FRONT_LOG_DIRECTORY=/dev/log

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project

@@ -0,0 +1,69 @@
+# Custom project values
+
+# Database
+PGDATABASE=gmf_{{cookiecutter.package}}
+PGSCHEMA=main
+PGSCHEMA_STATIC=main_static
+# To use the mutualised database.
+PGHOST=pg-gs.camptocamp.com
+PGHOST_SLAVE=pg-gs.camptocamp.com
+PGPORT=30100
+PGPORT_SLAVE=30101
+PGUSER=<user>
+PGPASSWORD=<pass>
+# Should be set to 'prefer' to be able to connect to a local database
+PGSSLMODE=require
+# To use a database on the host
+# PGHOST=172.17.0.1
+# PGHOST_SLAVE=172.17.0.1
+# PGPORT=5432
+# PGUSER=www-data
+# PGPASSWORD=www-data
+# PGSSLMODE=prefer
+
+# For Exoscale S3
+AWS_DEFAULT_REGION=ch-dk-2
+AWS_S3_ENDPOINT=sos-ch-dk-2.exo.io
+
+# Set the raster Base path
+# Amazon S3
+# RASTER_BASE_PATH=/vsis3/<bucket>/
+# Azure Blob Storage
+# RASTER_BASE_PATH=/vsiaz/<container>/
+
+# Use the mutualize print, ask Camptocamp to configure your project.
+# PRINT_URL=https://mutualized-print.apps.openshift-ch-1.camptocamp.com/print/{{cookiecutter.package}}/
+# To use the internal print:
+PRINT_URL=http://print:8080/print/
+
+TILEGENERATION_SQS_QUEUE=<queue_name>
+TILEGENERATION_S3_BUCKET=<bucket_name>
+TILEGENERATION_AZURE_CONTAINER=<container_name>
+
+# For production
+# FRONT_INNER_PORT=80
+# FRONT_CONFIG=haproxy
+# For development (front in https)
+FRONT_INNER_PORT=443
+FRONT_CONFIG=haproxy_dev
+
+# For OpenShift
+#REDIS_HOST=redis_sentinel
+#REDIS_PORT=26379
+#C2C_REDIS_SENTINELS=redis_sentinel:26379
+# For internal Redis
+REDIS_HOST=redis
+REDIS_PORT=6379
+C2C_REDIS_URL=redis://redis:6379/0
+
+# Set a strong password here for authentication on technical interfaces behind path /c2c
+C2C_SECRET=
+# Or use connection via GitHub, see: https://camptocamp.github.io/c2cgeoportal/{{cookiecutter.geomapfish_main_version}}/integrator/c2cwsgiutils.html#authentication
+C2C_AUTH_GITHUB_REPOSITORY=camptocamp/{{cookiecutter.package}}
+C2C_AUTH_GITHUB_ACCESS_TYPE=admin
+C2C_AUTH_GITHUB_CLIENT_ID=210aefe26259de1e9532
+#C2C_AUTH_GITHUB_CLIENT_SECRET=<github OAuth application client secret>
+C2C_AUTH_GITHUB_SCOPE=repo
+#C2C_AUTH_GITHUB_SECRET=<secret>
+#C2C_AUTH_GITHUB_PROXY_URL=https://geoservicies.camptocamp.com/redirect
+C2C_USE_SESSION=true

c2cgeoportal_geoportal/scaffolds/create/{geoportal/vars.yaml_tmpl → {{cookiecutter.project}}/geoportal/vars.yaml}

@@ -1,20 +1,32 @@
 ---
-
 extends: CONST_vars.yaml
 
 vars:
-
-  srid: {{srid}}
+  # To use an other SRID you should change:
+  #  - vars.srid
+  #  - vars.alternate_projections
+  #  - vars.resolutions
+  #  - vars.extent
+  #  - vars.tilesOrigin
+  #  - vars.interfaces_config.default.constants.gmfOptions.view.center
+  #  - vars.interfaces_config.default.constants.gmfOptions.wmtsTopLeft
+  #  - vars.interfaces_config.default.constants.gmfVectorTilesOptions.tileGrid.origin
+  srid: &srid {{cookiecutter.srid}}
+
+  main_ogc_server: source for image/png
 
   alternate_projections: &alternate_projections
     - EPSG:4326
     - EPSG:{srid}
     - EPSG:21781
 
-  resolutions: &resolutions [250, 100, 50, 20, 10, 5, 2, 1, 0.5, 0.25, 0.1, 0.05]
+  resolutions: &resolutions [250, 100, 50, 20, 10, 5, 2.5, 1, 0.5, 0.25, 0.1, 0.05]
 
   extent: &extent [2420000, 1030000, 2900000, 1350000]
 
+  # Origin of the tiles [left, top]
+  tilesOrigin: &tilesOrigin [2420000, 1350000]
+
   # The application's default language. This is the language used by
   # the application if no specific language is specified in the URLs.
   # This also defines the language used for the text search.
@@ -32,7 +44,7 @@ vars:
       constants:
         defaultTheme: Demo
         defaultLang: '{default_locale_name}'
-        gmfOptions:
+        gmfOptions: &gmfOptions
           map: {}
           view: &view
             projection: EPSG:{srid}
@@ -41,12 +53,20 @@ vars:
             resolutions: *resolutions
             extent: *extent
           geolocalisation: True
+          # Used to get pixel perfect render on WMTS layers [left, top]
+          wmtsTopLeft: *tilesOrigin
         gmfElevationOptions:
           layers: [aster, srtm]
         gmfSearchOptions:
           coordinatesProjections: *alternate_projections
         gmfPermalinkOptions:
           projectionCodes: *alternate_projections
+        gmfVectorTilesOptions:
+          projection: EPSG:{srid}
+          tileGrid:
+            extent: *extent
+            origin: *tilesOrigin
+            resolutions: *resolutions
       routes:
         fulltextsearchUrl:
           params:
@@ -56,12 +76,12 @@ vars:
     desktop:
       constants:
         gmfOptions:
+          <<: *gmfOptions
           map:
             maxTilesLoading: 128
           view:
             <<: *view
             constrainResolution: True
-          geolocalisation: True
         gmfExternalOGCServers:
           - name: swisstopo WMS
             type: WMS
@@ -83,7 +103,7 @@ vars:
             - code: EPSG:21781
               label: CH1903 / MN03
               filter: ngeoNumberCoordinates::{x}, {y} m
-            - code: EPSG:4326'
+            - code: EPSG:4326
               label: WGS84
               filter: ngeoDMSCoordinates:2:{y}, {x}
         ngeoProfileOptions:
@@ -99,11 +119,10 @@ vars:
     mobile:
       constants:
         gmfOptions:
-          map: {}
+          <<: *gmfOptions
           view:
             <<: *view
             autoRotate: True
-          geolocalisation: True
         gmfMobileMeasurePointOptions:
           rasterLayers:
             - name: aster
@@ -111,6 +130,10 @@ vars:
             - name: srtm
               unit: m
 
+    iframe_api:
+      constants:
+        gmfOptions: *gmfOptions
+
     api:
       constants:
         # The resolutions list.
@@ -140,7 +163,7 @@ vars:
     # Default values for the admin interface's maps.
     map:
       baseLayers:
-        - type_: "OSM"
+        - type_: OSM
       view:
         projection: 'EPSG:3857'
         center: [829170, 5933942]
@@ -157,6 +180,17 @@ vars:
   layers:
     geometry_validation: True
 
+  api:
+    # The name of the API in JavaScript
+    name: '{{cookiecutter.package}}'
+
+  # The "vector tiles web service" configuration. See the "vector tiles"
+  # chapter in the integrator documentation.
+  vector_tiles:
+    srid: *srid
+    extent: *extent
+    resolutions: *resolutions
+
   fulltextsearch:
     languages:
       fr: french
@@ -167,7 +201,13 @@ vars:
   shortener:
     # Used to send a confirmation email
     email_from: info@example.com
-    email_subject: "Geoportal URL"
+    email_subject: Geoportal URL
+    # Email template, can contain:
+    # - {full_url}
+    # - {short_url}
+    # - {message}
+    # - {application_url}
+    # - {current_url}
     email_body: |
       Hello,
 
@@ -192,6 +232,11 @@ vars:
     # Used to send a reset password email
     email_from: info@camptocamp.com
     email_subject: New password generated for GeoMapFish
+    # Email template, can contain:
+    # - {user}
+    # - {password}
+    # - {application_url}
+    # - {current_url}
     email_body: |
       Hello {user},
 
@@ -205,10 +250,15 @@ vars:
     # Used to send a welcome email for new user
     email_from: info@camptocamp.com
     email_subject: Welcome to GeoMapFish
+    # Email template, can contain:
+    # - {user}
+    # - {password}
+    # - {application_url}
+    # - {current_url}
     email_body: |
       Hello {user},
 
-      You have a new account on GeoMapFish: https://geomapfish-demo-2-6.camptocamp.com
+      You have a new account on GeoMapFish: {application_url}
       Your user name is: {user}
       Your password is: {password}
 
@@ -249,17 +299,47 @@ vars:
     std:
       # Standalone version
       backend: c2cgeoportal.hybrid
-      arguments:
+      arguments: &redis-cache-arguments
         host: '{REDIS_HOST}'
         port: '{REDIS_PORT}'
         db: '{REDIS_DB}'
-      # Openshift version
-      # arguments:
+      # Kubernetes version
+      # arguments: &redis-cache-arguments
       #   sentinels:
       #     - - '{REDIS_HOST}'
       #       - '{REDIS_PORT}'
       #   connection_kwargs:
       #     db: '{REDIS_DB}'
+    ogc-server:
+      # Standalone version
+      backend: c2cgeoportal.hybrid
+      # All versions
+      arguments: *redis-cache-arguments
+
+  # This parameter set the list of hosts allowed to use the iframe api.
+  # 'self' will block all external usage, you must add additional hosts separated by space.
+  # see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/frame-ancestors
+  content_security_policy_iframe_api_frame_ancestors: "'self'"
+
+  # Control the HTTP headers
+  headers:
+    dynamic: &header {}
+    index: *header
+    api: *header
+    apihelp: *header
+    profile: *header
+    raster: *header
+    vector_tiles: *header
+    error: *header
+    themes: &auth_header {}
+    config: *auth_header
+    print: *auth_header
+    fulltextsearch: *auth_header
+    mapserver: *auth_header
+    tinyows: *auth_header
+    layers: *auth_header
+    shortener: *auth_header
+    login: {}
 
 update_paths:
   - admin_interface.available_functionalities
@@ -269,6 +349,7 @@ update_paths:
   - api
   - authorized_referers
   - cache.std.arguments
+  - cache.ogc-server.arguments
   - cache.obj
   - check_collector.disabled
   - check_collector.hosts
@@ -284,47 +365,56 @@ update_paths:
   - fulltextsearch
   - functionalities.available_in_templates
   - global_headers
-  - headers.index
-  - headers.api
-  - headers.profile
-  - headers.raster
-  - headers.error
-  - headers.themes
-  - headers.config
-  - headers.print
-  - headers.fulltextsearch
-  - headers.mapserver
-  - headers.tinyows
-  - headers.layers
-  - headers.shortener
-  - headers.login
+  - headers.dynamic.headers
+  - headers.index.headers
+  - headers.api.headers
+  - headers.apihelp.headers
+  - headers.profile.headers
+  - headers.raster.headers
+  - headers.vector_tiles.headers
+  - headers.error.headers
+  - headers.themes.headers
+  - headers.config.headers
+  - headers.print.headers
+  - headers.fulltextsearch.headers
+  - headers.mapserver.headers
+  - headers.tinyows.headers
+  - headers.layers.headers
+  - headers.shortener.headers
+  - headers.login.headers
   - interfaces_config.default.constants.ngeoWfsPermalinkOptions
+  - interfaces_config.default.constants.gmfOptions.view
   - interfaces_config.default.constants.gmfSearchOptions
   - interfaces_config.default.constants.gmfPermalinkOptions
+  - interfaces_config.default.constants.gmfVectorTilesOptions
   - interfaces_config.default.dynamic_constants
   - interfaces_config.default.static
   - interfaces_config.default.routes.fulltextsearchUrl
-  - interfaces_config.desktop.constants
+  - interfaces_config.desktop.constants.gmfOptions.view
+  - interfaces_config.desktop.constants.gmfPrintOptions
   - interfaces_config.desktop.routes
+  - interfaces_config.mobile.constants.gmfOptions.view
   - interfaces_config.mobile.constants.gmfMobileMeasurePointOptions
-  - interfaces_config.iframe_api.constants
+  - interfaces_config.iframe_api.constants.gmfOptions.view
   - interfaces_config.api.constants
   - interfaces_config.api.routes.searchUrl
   - interfaces_theme
   - resourceproxy
   - servers
   - shortener.allowed_hosts
+  - smtp
   - sqlalchemy
   - sqlalchemy_slave
   - tinyowsproxy
+  - authentication
 
 no_interpreted:
   - reset_password.email_body
   - shortener.email_body
   - welcome_email.email_body
 
-# Standalone version
-# runtime_postprocess:
-#   - expression: "int({})"
-#     vars:
-#       - cache.std.arguments.port
+# Only for Standalone version (should be commented for Kubernetes version)
+runtime_postprocess:
+  - expression: int({})
+    vars:
+      - cache.std.arguments.port

c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/data/Readme.txt

@@ -20,7 +20,7 @@ ISO3		String(3)		ISO 3166-1 Alpha-3 Country Code
 UN		Short Integer(3)	ISO 3166-1 Numeric-3 Country Code
 NAME		String(50)		Name of country/area
 AREA		Long Integer(7)		Land area, FAO Statistics (2002)
-POP2005		Double(10,0)	 	Population, World Polulation Prospects (2005)
+POP2005		Double(10,0)	 	Population, World Population Prospects (2005)
 REGION		Short Integer(3) 	Macro geographical (continental region), UN Statistics
 SUBREGION	Short Integer(3)	Geogrpahical sub-region, UN Statistics
 LON		FLOAT (7,3)		Longitude
@@ -36,13 +36,13 @@ CHANGELOG VERSION 0.3 - 30 July 2008
 
 CHANGELOG VERSION 0.2 - 1 April 2008
 
-- Made new ZIP archieves. No change in dataset.
+- Made new ZIP archives. No change in dataset.
 
 
 CHANGELOG VERSION 0.1 - 13 March 2008
 
 - Polygons representing each country were merged into one feature
-- �land Islands was extracted from Finland
+- Åland Islands was extracted from Finland
 - Hong Kong was extracted from China
 - Holy See (Vatican City) was added
 - Gaza Strip and West Bank was merged into "Occupied Palestinean Territory"