Merge remote-tracking branch 'upstream/master'

Author: Zharktas

.bowerrc

@@ -0,0 +1,65 @@
+name: Tests
+on: [push, pull_request]
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Install requirements
+        run: pip install flake8 pycodestyle
+      - name: Check syntax
+        run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics --exclude ckan
+
+  test:
+    needs: lint
+    strategy:
+      matrix:
+        include:
+          - ckan-version: "2.11"
+            ckan-image: "ckan/ckan-dev:2.11-py3.10"
+          - ckan-version: "2.10"
+            ckan-image: "ckan/ckan-dev:2.10-py3.10"
+          - ckan-version: "2.9"
+            ckan-image: "ckan/ckan-dev:2.9-py3.9"
+      fail-fast: false
+
+    name: CKAN ${{ matrix.ckan-version }}
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ matrix.ckan-image }}
+      options: --user root
+    services:
+      solr:
+        image: ckan/ckan-solr:${{ matrix.ckan-version }}-solr9
+      postgres:
+        image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      redis:
+          image: redis:3
+    env:
+      CKAN_SQLALCHEMY_URL: postgresql://ckan_default:pass@postgres/ckan_test
+      CKAN_DATASTORE_WRITE_URL: postgresql://datastore_write:pass@postgres/datastore_test
+      CKAN_DATASTORE_READ_URL: postgresql://datastore_read:pass@postgres/datastore_test
+      CKAN_SOLR_URL: http://solr:8983/solr/ckan
+      CKAN_REDIS_URL: redis://redis:6379/1
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install requirements
+      run: |
+        pip install -r dev-requirements.txt
+        pip install -e .
+        # Replace default path to CKAN core config file with the one on the container
+        sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini
+    - name: Setup extension
+      run: |
+        ckan -c test.ini db init
+    - name: Run tests
+      run: pytest --ckan-ini=test.ini --disable-warnings ckanext/geoview/tests

.github/workflows/test.yml

@@ -10,7 +10,7 @@ used to be part of ckanext-spatial_.
 **Note:** This is a work in progress, if you can help with `OpenLayers`_ or `Leaflet`_ development,
 check the `Issues` section for what needs to be done or add a new issue.
 
-This extensions supports CKAN 2.6 onwards, including Python 3 support on CKAN 2.9 or higher.
+This extensions supports CKAN 2.7 onwards, including Python 3 support on CKAN 2.9 or higher.
 
 ------------
 Installation
@@ -76,11 +76,11 @@ OpenLayers Viewer
 
 The OpenLayers_ viewer provides access to different geospatial formats and services:
 
-To enable it, add ``geo_view`` to your ``ckan.plugins`` setting. (use ``geo_preview`` if you are using CKAN < 2.3)::
+To enable it, add ``geo_view`` to your ``ckan.plugins`` setting.::
 
     ckan.plugins = ... resource_proxy geo_view
 
-On CKAN >= 2.3, if you want the geospatial views to be created by default, add the plugin to the following setting::
+If you want the geospatial views to be created by default, add the plugin to the following setting::
 
 
     ckan.views.default_views = ... geo_view
@@ -247,11 +247,11 @@ Leaflet GeoJSON Viewer
 
 The Leaflet_ GeoJSON_ viewer will render GeoJSON files on a map and add a popup showing the features properties, for those resources that have a ``geojson`` format.
 
-To enable it, add ``geojson_view`` to your ``ckan.plugins`` setting. (use ``geojson_preview`` if you are using CKAN < 2.3)::
+To enable it, add ``geojson_view`` to your ``ckan.plugins`` setting.::
 
     ckan.plugins = ... resource_proxy geojson_view
 
-On CKAN >= 2.3, if you want the views to be created by default on all GeoJSON files, add the plugin to the following setting::
+If you want the views to be created by default on all GeoJSON files, add the plugin to the following setting::
 
 
     ckan.views.default_views = ... geojson_view
@@ -269,11 +269,11 @@ Leaflet WMTS Viewer
 
 The Leaflet_ WMTS viewer will render WMTS (Web Map Tile Service) layers on a map for those resources that have a ``wmts`` format.
 
-To enable it, add ``wmts_view`` to your ``ckan.plugins`` setting. (use ``wmts_preview`` if you are using CKAN < 2.3)::
+To enable it, add ``wmts_view`` to your ``ckan.plugins`` setting.::
 
     ckan.plugins = ... resource_proxy wmts_view
 
-On CKAN >= 2.3, if you want the views to be created by default on all WMTS resources, add the plugin to the following setting::
+If you want the views to be created by default on all WMTS resources, add the plugin to the following setting::
 
 
     ckan.views.default_views = ... wmts_view
@@ -286,11 +286,11 @@ Leaflet ESRI Shapefile Viewer
 
 The Leaflet_ Shapefile_ viewer will render ESRI Shapfiles (A ZIP archive contains the .shp, .shx, .dbf, and .prj files) on a map and add a popup showing the features properties, for those resources that have a ``shp`` format.
 
-To enable it, add ``shp_view`` to your ``ckan.plugins`` setting. (use ``shp_preview`` if you are using CKAN < 2.3)::
+To enable it, add ``shp_view`` to your ``ckan.plugins`` setting.::
 
     ckan.plugins = ... resource_proxy shp_view
 
-On CKAN >= 2.3, if you want the views to be created by default on all Shapefiles, add the plugin to the following setting::
+If you want the views to be created by default on all Shapefiles, add the plugin to the following setting::
 
 
     ckan.views.default_views = ... shp_view
@@ -310,7 +310,7 @@ Common base layers for Map Widgets
 
 The geospatial view plugins support the same base map configurations than the ckanext-spatial `widgets`_.
 
-Check the following page to learn how to choose a different base map layer (Stamen, MapBox or custom):
+Check the following page to learn how to choose a different base map layer:
 
 http://docs.ckan.org/projects/ckanext-spatial/en/latest/map-widgets.html
 
@@ -319,9 +319,27 @@ http://docs.ckan.org/projects/ckanext-spatial/en/latest/map-widgets.html
 
 .. _widgets: http://docs.ckan.org/projects/ckanext-spatial/en/latest/spatial-search.html#spatial-search-widget
 
+> [!WARNING]  
+> As of July 2024 the common map configuration is not working with the OpenLayers viewer. Pull requests are welcome to address the issue
+
+-------------------------
+Updating the JS libraries
+-------------------------
+
+To update a JS library to a new version:
+
+1. Update the version number in ``package.json``
+2. Run ``npm install``
+3. Run ``npm run update-libs``
+
+The following libraries are managed manually as they don't have npm packages:
+
+* ol-helpers
+* shp2geojson
+
 
 -----------------------------------
-Registering ckanext-geoview on PyPI
+Registering ckanext-geoview on pypi
 -----------------------------------
 
 ckanext-geoview should be availabe on PyPI as

README.rst

@@ -1,4 +1,4 @@
-.label[data-format=wfs] {
+.badge[data-format=wfs] {
     background-color: #7aae3d;
 }
 .format-label[data-format=wfs],
@@ -11,7 +11,7 @@
     height: 35px;
 }
 
-.label[data-format=wms] {
+.badge[data-format=wms] {
     background-color: #adc717;
 }
 .format-label[data-format=wms],
@@ -24,7 +24,7 @@
     height: 35px;
 }
 
-.label[data-format=gml] {
+.badge[data-format=gml] {
     background-color: #7aae3d;
 }
 .format-label[data-format=gml],
@@ -37,7 +37,7 @@
     height: 35px;
 }
 
-.label[data-format=kml] {
+.badge[data-format=kml] {
     background-color: #7aae3d;
 }
 .format-label[data-format=kml],
@@ -50,7 +50,7 @@
     height: 35px;
 }
 
-.label[data-format=geojson] {
+.badge[data-format=geojson] {
     background-color: #9855e0;
 }
 .format-label[data-format=geojson],
@@ -63,7 +63,7 @@
     height: 35px;
 }
 
-.label[data-format=wmts] {
+.badge[data-format=wmts] {
     background-color: #3333ff;
 }
 .format-label[data-format=wmts],
@@ -76,7 +76,7 @@
     height: 35px;
 }
 
-.label[data-format=shp] {
+.badge[data-format=shp] {
     background-color: #0080ff;
 }
 .format-label[data-format=shp],
@@ -89,6 +89,6 @@
     height: 35px;
 }
 
-.label[data-format=arcgis_rest] {
+.badge[data-format=arcgis_rest] {
     background-color: #5c3ee0;
 }

bower.json

@@ -19,3 +19,13 @@ html, body {
   height: 300px;
   overflow: auto;
 }
+
+.leaflet-control-no-provider {
+  background-color: white;
+  margin-right: 10px;
+  padding: 10px;
+  border: 1px solid #b1b1b1;
+}
+.leaflet-control-attribution {
+  font-size: 11px;
+}

ckanext/geoview/assets/css/geo-resource-styles.css

@@ -36,3 +36,13 @@ html, body {
   overflow: auto;
   max-height: 200px;
 }
+
+.leaflet-control-no-provider {
+  background-color: white;
+  margin-right: 10px;
+  padding: 10px;
+  border: 1px solid #b1b1b1;
+}
+.leaflet-control-attribution {
+  font-size: 11px;
+}

ckanext/geoview/assets/css/geojson_preview.css

@@ -11,42 +11,20 @@ html, body {
   height: 100%;
 }
 
-#map .table{
-  width: 300px;
-}
-
-#map label {
-  font-weight: normal;
-}
-
-#map label:after {
-  content: none;
-}
-
-#map input {
-  width: auto;
-  top: auto;
-}
-
 .leaflet-control-layers {
-  box-shadow: 0 1px 7px rgba(0,0,0,0.4);
-  background: #f8f8f9;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-  overflow: auto;
   max-height: 200px;
+  overflow-y: hidden;
 }
 
 .ui-opacity {
-  box-shadow: 0 0 8px rgba(0,0,0,0.4);
   background: rgba(255, 255, 255, 0.8);
   position: absolute;
-  left: 13px;
-  top: 70px;
+  left: 14px;
+  top: 80px;
   height: 200px;
   width: 22px;
-  border: 1px solid #888;
-  border-radius: 5px;
+  border: 2px solid rgba(0, 0, 0, 0.2);
+  border-radius: 4px;
   z-index: 1000;
  }
 
@@ -65,3 +43,13 @@ html, body {
 .ui-opacity .handle:hover {
   background: #303030;
 }
+
+.leaflet-control-no-provider {
+  background-color: white;
+  margin-right: 10px;
+  padding: 10px;
+  border: 1px solid #b1b1b1;
+}
+.leaflet-control-attribution {
+  font-size: 11px;
+}