Merge branch 'master' into async_conflict

geopartner · Apr 20, 2022 · 3c4dd57 · 3c4dd57
2 parents 1afd9f1 + e84c46a
commit 3c4dd57
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [CalVer](https://calver.org/).
 
+## [2022.4.0] - 2022-8-4
+### Fixed
+- Now uses sfe_ejendomsnummer instead of esr_ejendomsnummer in search of 'adresser' and 'matrikel'.
+
 ## [2022.3.3] - 2022-24-3
 ### Fixed
 - Regression bug, which kept the right side-panel closed after load of app.

diff --git a/browser/modules/search/danish.js b/browser/modules/search/danish.js
@@ -937,7 +937,7 @@ module.exports = {
                         placeStores[key].db = MDB;
                         placeStores[key].host = MHOST;
                         if (getProperty) {
-                            placeStores[key].sql = "SELECT esr_ejendomsnummer,ST_Multi(ST_Union(the_geom)),ST_asgeojson(ST_transform(ST_Multi(ST_Union(the_geom)),4326)) as geojson FROM matrikel.jordstykke WHERE esr_ejendomsnummer = (SELECT esr_ejendomsnummer FROM matrikel.jordstykke WHERE gid=" + gids[type2][datum.value] + ") group by esr_ejendomsnummer";
+                            placeStores[key].sql = "SELECT sfe_ejendomsnummer,ST_Multi(ST_Union(the_geom)),ST_asgeojson(ST_transform(ST_Multi(ST_Union(the_geom)),4326)) as geojson FROM matrikel.jordstykke WHERE sfe_ejendomsnummer = (SELECT sfe_ejendomsnummer FROM matrikel.jordstykke WHERE gid=" + gids[type2][datum.value] + ") group by sfe_ejendomsnummer";
                         } else {
                             placeStores[key].sql = "SELECT gid,the_geom,matrikelnummer,ejerlavsnavn, ST_asgeojson(ST_transform(the_geom,4326)) as geojson FROM matrikel.jordstykke WHERE gid='" + gids[type2][datum.value] + "'";
                         }
@@ -948,7 +948,7 @@ module.exports = {
                         placeStores[key].db = ADB;
                         placeStores[key].host = AHOST;
                         if (getProperty) {
-                            placeStores[key].sql = "SELECT esr_ejendomsnummer,ST_Multi(ST_Union(the_geom)),ST_asgeojson(ST_transform(ST_Multi(ST_Union(the_geom)),4326)) as geojson FROM matrikel.jordstykke WHERE esr_ejendomsnummer = (SELECT esr_ejendomsnummer FROM matrikel.jordstykke WHERE (the_geom && (SELECT ST_transform(the_geom, 25832) FROM dar.adgangsadresser WHERE id='" + gids[type1][datum.value] + "')) AND ST_Intersects(the_geom, (SELECT ST_transform(the_geom, 25832) FROM dar.adgangsadresser WHERE id='" + gids[type1][datum.value] + "'))) group by esr_ejendomsnummer";
+                            placeStores[key].sql = "SELECT sfe_ejendomsnummer,ST_Multi(ST_Union(the_geom)),ST_asgeojson(ST_transform(ST_Multi(ST_Union(the_geom)),4326)) as geojson FROM matrikel.jordstykke WHERE sfe_ejendomsnummer = (SELECT sfe_ejendomsnummer FROM matrikel.jordstykke WHERE (the_geom && (SELECT ST_transform(the_geom, 25832) FROM dar.adgangsadresser WHERE id='" + gids[type1][datum.value] + "')) AND ST_Intersects(the_geom, (SELECT ST_transform(the_geom, 25832) FROM dar.adgangsadresser WHERE id='" + gids[type1][datum.value] + "'))) group by sfe_ejendomsnummer";
                         } else {
                             placeStores[key].sql = "SELECT id,husnr,postnr,kommunekode,the_geom,ST_asgeojson(ST_transform(the_geom,4326)) as geojson FROM dar.adgangsadresser WHERE id='" + gids[type1][datum.value] + "'";
                         }

diff --git a/docs/da/pages/extension/non_standard.rst b/docs/da/pages/extension/non_standard.rst
@@ -0,0 +1,50 @@
+.. _non_standard_extensions:
+
+#################################################################
+Ikke-standard extensions
+#################################################################
+
+.. topic:: Overview
+
+    :Date: |today|
+    :Author: `mapcentia <https://github.com/mapcentia>`_
+
+.. contents::
+    :depth: 3
+
+*****************************************************************
+Introduktion
+*****************************************************************
+
+Herunder findes dokumentation på nogle af de extensions, som ikke følger med Vidi som standard. Skal en af disse anvendes kræves det, at den bliver installeret.
+
+*****************************************************************
+Rejsetid (otp)
+*****************************************************************
+
+Rejsetid extensionen opsættes i en kørselskonfiguration (config) under :ref:`configjs_extensionconfig`
+
+``routes`` er en liste med de grafer, som brugeren skal kunne vælge imellem i Vidi.
+
+``default`` angiver start-værdier for de forskellige indstillinger i Vidi. Alle behøves ikke udfyldes. Hvis der undlades indstillinger, bliver der anvendt værdier, som svarer til de nedenunser viste.
+
+.. code-block:: json
+
+    {
+        "extensionConfig": {
+            "otp": {
+                "routes": ["default", "nt", "midttrafik", "sydtrafik"],
+                "defaults": {
+                    "startTime": 30,
+                    "endTime": 50,
+                    "intervals": [600, 1200, 1800],
+                    "startColor": "#ff0000",
+                    "endColor": "#00ff00",
+                    "opacity": 0.7,
+                    "arriveBy": false,
+                    "route": "default",
+                    "maxWalkDistance": 500
+                }
+            }
+        }
+    }
diff --git a/public/index.html.default b/public/index.html.default
@@ -21,7 +21,7 @@
   ~ @author     Martin Høgh <[email protected]>
   ~ @copyright  2013-2022 MapCentia ApS
   ~ @license    http://www.gnu.org/licenses/#AGPL  GNU AFFERO GENERAL PUBLIC LICENSE 3
-  ~ @version    2022.3.3
+  ~ @version    UNRELEASED
 
   -->
 <html lang="en">