Merge opengisch/qgis-swiss-locator/master

.github/workflows/update-layers.yml

@@ -0,0 +1,39 @@
+
+name: Update Layers
+
+on:
+  schedule:
+    # weekly
+    - cron:  '0 0 * * 0'
+  push:
+    branches:
+      - master
+    paths:
+      - .github/workflows/update-layers.yml
+  workflow_dispatch:
+
+jobs:
+  update-layers:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get source code
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+
+      - name: Update layers
+        run: |
+          cd swiss_locator/map_geo_admin
+          ./download_layer_data.py
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          commit-message: update map.geo.admin.ch layers
+          title: Automated updates to map.geo.admin.ch layers
+          body:
+          branch: update-layers

README.md

@@ -13,7 +13,7 @@ Similarly to the online geoportal [https://map.geo.admin.ch](https://map.geo.adm
    * ZIP codes
    * addresses
    * cadastral parcels
-* WMS layers, which can easily be added to the map
+* WMS layers from Federal Geoportal (map.geo.admin.ch) or opendata.swiss, which can easily be added to the map
 * features (search through features descriptions)
 
 
@@ -25,6 +25,7 @@ Configuration is achieved in the main application settings under the `locator` t
 * enable or disable searches (locations, layers, features)
 * customize prefixes, define if they are default filters (used without prefix)
 * access to the configuration of the plugin
+* include or exclude opendata.swiss data from layer searches
 
 In the configuration of the plugin, further customization can be achieved:
 * language definition (English, German, French, Italian, Rumantsch)
@@ -37,8 +38,8 @@ In the configuration of the plugin, further customization can be achieved:
 Type the text to search in the locator bar.
 
 If the result is a **WMS layer**, double-clicking on it will try to add it to the map. 
-It might not be possible since some layers are only visible in the geoportal.
-In any case, a link will be shown to display the layer in the geoportal.
+It might not be possible since some layers are only visible in the geoportal (map.geo.admin.ch).
+In this case, a link will be shown to display the layer in the geoportal.
 
 If the result is a **location** or **feature**, 
 double-clicking on it will move the map canvas to the result and highlight its position.

swiss_locator/core/settings.py

@@ -52,5 +52,5 @@ def __init__(self):
         self.add_setting(Bool("feature_search_restrict", Scope.Global, False))
         self.add_setting(Stringlist("feature_search_layers_list", Scope.Global, None))
 
-
+        self.add_setting(Bool("layers_include_opendataswiss", Scope.Global, True))
 

swiss_locator/metadata.txt

@@ -2,14 +2,14 @@
 [general]
 name=Swiss Locator
 qgisMinimumVersion=3.2
-description=A locator filter for Swiss Geoportal (geo.admin.ch)
-about=Search for locations, WMS layers of features in the whole Swiss Geoportal catalog
+description=A locator filter for Swiss Geoportal (geo.admin.ch) and opendata.swiss resources
+about=Search for locations, WMS layers of features in the whole Swiss Geoportal catalog as well as in opendata.swiss
 version=dev
 author=Denis Rouzaud
 [email protected]
 
 # Tags are comma separated with spaces allowed
-tags=swiss, suisse, schweiz, locator, geoadmin, geoportal
+tags=swiss, suisse, schweiz, locator, geoadmin, geoportal, opendata.swiss
 
 tracker=https://github.com/opengisch/qgis-swiss-locator
 homepage=https://github.com/opengisch/qgis-swiss-locator

swiss_locator/swiss_locator_plugin.py

@@ -36,7 +36,7 @@ def __init__(self, iface: QgisInterface):
         qgis_locale = QLocale(QSettings().value('locale/userLocale'))
         locale_path = os.path.join(os.path.dirname(__file__), 'i18n')
         self.translator = QTranslator()
-        self.translator.load(qgis_locale, 'swiss_locator', '_', locale_path)
+        self.translator.load(qgis_locale, 'qgis-swiss-locator', '_', locale_path)
         QCoreApplication.installTranslator(self.translator)
 
         self.locator_filters = {}

swiss_locator/ui/config.ui

@@ -234,7 +234,10 @@
        <item row="1" column="1">
         <widget class="QSpinBox" name="layers_limit"/>
        </item>
-       <item row="2" column="0">
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="layers_include_opendataswiss"/>
+       </item>
+       <item row="3" column="0">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -247,6 +250,13 @@
          </property>
         </spacer>
        </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>Include data from opendata.swiss</string>
+         </property>
+        </widget>
+       </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label_7">
          <property name="text">