deploy: d771cad

Dataport · Feb 28, 2025 · 85502a4 · 85502a4
1 parent 39d56e3
commit 85502a4
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 56 deletions.
diff --git a/docs/diplan/dist/index.es-DLPcd99s.js → docs/diplan/dist/index.es-CGKZ3LpL.js b/docs/diplan/dist/index.es-DLPcd99s.js → docs/diplan/dist/index.es-CGKZ3LpL.js
diff --git a/docs/diplan/dist/index.es-DLPcd99s.js.map → docs/diplan/dist/index.es-CGKZ3LpL.js.map b/docs/diplan/dist/index.es-DLPcd99s.js.map → docs/diplan/dist/index.es-CGKZ3LpL.js.map
diff --git a/docs/diplan/dist/polar-client-DgakOSS8.js → docs/diplan/dist/polar-client-BIM0PeLO.js b/docs/diplan/dist/polar-client-DgakOSS8.js → docs/diplan/dist/polar-client-BIM0PeLO.js
@@ -121108,7 +121108,7 @@ function(e) {
  */
 function(e) {
   function A() {
-    return (Pt.canvg ? Promise.resolve(Pt.canvg) : import("./index.es-DLPcd99s.js")).catch(function(t) {
+    return (Pt.canvg ? Promise.resolve(Pt.canvg) : import("./index.es-CGKZ3LpL.js")).catch(function(t) {
       return Promise.reject(new Error("Could not load canvg: " + t));
     }).then(function(t) {
       return t.default ? t.default : t;
@@ -125424,36 +125424,43 @@ const LYA = new Wi(), VYA = {
 ) : e, ZYA = (e, A, t = "unequal") => VYA[t](
   e.map((c) => KYA(c, A)).filter((c) => c !== null)
 ), qYA = (e, A, t, c) => Promise.all(
-  e.features.map(
-    (n) => Promise.all(
-      t.map(
-        ({ id: i, propertyNames: B, aggregationMode: E }) => ES({
-          feature: LYA.readFeature(JSON.stringify(n)),
-          fetchLayerId: i,
-          projectionCode: A.getView().getProjection().getCode(),
-          signal: c
-        }).then(
-          (s) => oB.getLayerWhere({ id: i }).typ === "WFS" ? ZT(s, void 0, !1) : s.json()
-        ).then((s) => {
-          var M;
-          const g = s.features.filter(
-            (r) => bYA(r, n)
-          ).map(({ properties: r }) => r), Q = ZYA(
-            g,
-            B,
-            E
-          );
-          n.properties = {
-            ...n.properties,
-            metaProperties: {
-              ...((M = n.properties) == null ? void 0 : M.metaProperties) || {},
-              [i]: Q
-            }
-          };
-        })
-      )
-    )
-  )
+  e.features.map(async (n) => {
+    var i;
+    return {
+      ...n,
+      properties: {
+        ...n.properties,
+        metaProperties: {
+          ...((i = n.properties) == null ? void 0 : i.metaProperties) || {},
+          ...Object.fromEntries(
+            await Promise.all(
+              t.map(
+                ({ id: B, propertyNames: E, aggregationMode: s }) => ES({
+                  feature: LYA.readFeature(
+                    JSON.stringify(n)
+                  ),
+                  fetchLayerId: B,
+                  projectionCode: A.getView().getProjection().getCode(),
+                  signal: c
+                }).then(
+                  (g) => oB.getLayerWhere({ id: B }).typ === "WFS" ? ZT(g, void 0, !1) : g.json()
+                ).then((g) => {
+                  const Q = g.features.filter(
+                    (r) => bYA(r, n)
+                  ).map(({ properties: r }) => r), M = ZYA(
+                    Q,
+                    E,
+                    s
+                  );
+                  return [B, M];
+                })
+              )
+            )
+          )
+        }
+      }
+    };
+  })
 );
 let sF = null;
 const x2 = "plugin/draw/featureCollection", _YA = (e) => JSON.parse(JSON.stringify(e)), kJ = () => ({
@@ -125483,7 +125490,7 @@ const x2 = "plugin/draw/featureCollection", _YA = (e) => JSON.parse(JSON.stringi
         vYA(i)
       ), c.configuration.metaServices.length)
         try {
-          await qYA(
+          i.features = await qYA(
             i,
             t.map,
             c.configuration.metaServices,
@@ -125655,4 +125662,4 @@ export {
   ot as c,
   Ir as g
 };
-//# sourceMappingURL=polar-client-DgakOSS8.js.map
+//# sourceMappingURL=polar-client-BIM0PeLO.js.map
diff --git a/.../diplan/dist/polar-client-DgakOSS8.js.map → .../diplan/dist/polar-client-BIM0PeLO.js.map b/.../diplan/dist/polar-client-DgakOSS8.js.map → .../diplan/dist/polar-client-BIM0PeLO.js.map
diff --git a/docs/diplan/dist/polar-client.js b/docs/diplan/dist/polar-client.js
diff --git a/docs/diplan/dist/polar-client.js.map b/docs/diplan/dist/polar-client.js.map
diff --git a/docs/diplan/example/dev/config.js b/docs/diplan/example/dev/config.js
@@ -11,6 +11,17 @@ export default {
   extent: [
     248651.73157077, 5227198.20287631, 928366.12236557, 6118661.62507136,
   ],
+  diplan: {
+    mergeToMultiGeometries: true,
+    validateGeoJson: true,
+    metaServices: [
+      {
+        id: flurstuecke,
+        propertyNames: ['land', 'gemarkung', 'regbezirk', 'kreis', 'gemeinde'],
+        aggregationMode: 'unequal',
+      },
+    ],
+  },
   locales: [
     {
       type: 'de',

diff --git a/docs/diplan/example/polar-ui/index.html b/docs/diplan/example/polar-ui/index.html
@@ -81,21 +81,6 @@ <h2>Informationen aus Kartenklient</h2>
               <td id="subscribed-draw">uninitialized</td>
               <td>Die hergestellte Zeichnung als GeoJSON (ohne diplanspezifische Metainformationen und Modifikationen).</td>
             </tr>
-            <tr>
-              <td><code>plugin/...</code></td>
-              <td id="subscribed-a">uninitialized</td>
-              <td>Platz für weitere Beispiele</td>
-            </tr>
-            <tr>
-              <td><code>plugin/...</code></td>
-              <td id="subscribed-b">uninitialized</td>
-              <td>Platz für weitere Beispiele</td>
-            </tr>
-            <tr>
-              <td><code>plugin/...</code></td>
-              <td id="subscribed-c">uninitialized</td>
-              <td>Platz für weitere Beispiele</td>
-            </tr>
           </tbody>
         </table>
       </section>

diff --git a/docs/diplan/example/polar-ui/setup.js b/docs/diplan/example/polar-ui/setup.js
@@ -60,8 +60,6 @@ export default (client, layerConf, config) => {
        * https://dataport.github.io/polar/docs/diplan/client-diplan.html
        */
 
-      // TODO expand example bindings
-
       const actionPlus = document.getElementById('action-plus')
       const actionMinus = document.getElementById('action-minus')
       const actionToast = document.getElementById('action-toast')
@@ -100,6 +98,15 @@ export default (client, layerConf, config) => {
       actionLasso.onclick = () =>
         mapInstance.$store.dispatch('plugin/draw/setMode', 'lasso')
 
+      const htmlRevisedDrawExport = document.getElementById(
+        'subscribed-revised-draw-export'
+      )
+      const htmlRevisionInProgress = document.getElementById(
+        'subscribed-revision-in-progress'
+      )
+      const htmlSimpleGeometryValidity = document.getElementById(
+        'subscribed-simple-geometry-validity'
+      )
       const htmlZoom = document.getElementById('subscribed-zoom')
       const htmlGfi = document.getElementById('subscribed-gfi')
       const htmlExportA = document.getElementById('subscribed-export-a')
@@ -128,6 +135,25 @@ export default (client, layerConf, config) => {
       mapInstance.subscribe('plugin/draw/featureCollection', (geojson) => {
         htmlDraw.innerHTML = JSON.stringify(geojson, null, 2)
       })
+      mapInstance.subscribe('diplan/revisedDrawExport', (revisedDrawExport) => {
+        htmlRevisedDrawExport.innerHTML = JSON.stringify(
+          revisedDrawExport,
+          null,
+          2
+        )
+      })
+      mapInstance.subscribe(
+        'diplan/revisionInProgress',
+        (revisionInProgress) => {
+          htmlRevisionInProgress.innerHTML = revisionInProgress
+        }
+      )
+      mapInstance.subscribe(
+        'diplan/simpleGeometryValidity',
+        (simpleGeometryValidity) => {
+          htmlSimpleGeometryValidity.innerHTML = simpleGeometryValidity
+        }
+      )
 
       window.mapInstance = mapInstance
     })