drf-react-by-schema 0.28.11 → 0.28.13

package/dist/components/DataGridBySchemaEditable/GeoThumbCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeoThumbCell.d.ts","sourceRoot":"","sources":["../../../src/components/DataGridBySchemaEditable/GeoThumbCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAQzC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AA8B/D,UAAU,iBAAiB;IACzB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,QAAQ,EACR,KAAK,EACL,KAAwB,EACxB,MAAyB,GAC1B,EAAE,iBAAiB,qBAuCnB"}
+{"version":3,"file":"GeoThumbCell.d.ts","sourceRoot":"","sources":["../../../src/components/DataGridBySchemaEditable/GeoThumbCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAQzC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAe,MAAM,cAAc,CAAC;AAyD5E,UAAU,iBAAiB;IACzB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EACnC,QAAQ,EACR,KAAK,EACL,KAAwB,EACxB,MAAyB,GAC1B,EAAE,iBAAiB,qBAoCnB"}

package/dist/components/DataGridBySchemaEditable/GeoThumbCell.js

@@ -44,9 +44,32 @@ const styles_1 = require("@mui/material/styles");
 const leaflet_1 = __importDefault(require("leaflet"));
 const leafletMarker_1 = require("../forms/inputs/leafletMarker");
 const utils_1 = require("../../utils");
+const MapGeometryPicker_1 = require("../forms/inputs/MapGeometryPicker");
 const geoConstants_1 = require("./geoConstants");
 // L.geoJSON point markers use L.Icon.Default; ensure it points at a servable icon.
 (0, leafletMarker_1.applyDefaultLeafletIcon)();
+/** Renders the base tile layer for the thumbnail.
+ *  Reads the first entry from theme.mapLayers (same array the picker uses);
+ *  falls back to DEFAULT_LAYERS[0] (hybrid satellite + labels) when absent. */
+function BaseLayer() {
+    const map = (0, react_leaflet_1.useMap)();
+    const theme = (0, styles_1.useTheme)();
+    (0, react_1.useEffect)(() => {
+        const layers = theme.mapLayers;
+        const cfg = layers && layers.length > 0 ? layers[0] : MapGeometryPicker_1.DEFAULT_LAYERS[0];
+        if (cfg.title === 'Hybrid') {
+            const satellite = leaflet_1.default.tileLayer(cfg.url, { attribution: cfg.attribution });
+            const labels = leaflet_1.default.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}', { attribution: 'Esri, TomTom, Garmin, FAO, NOAA, USGS, © OpenStreetMap' });
+            satellite.addTo(map);
+            labels.addTo(map);
+            return () => { satellite.remove(); labels.remove(); };
+        }
+        const tl = leaflet_1.default.tileLayer(cfg.url, { attribution: cfg.attribution });
+        tl.addTo(map);
+        return () => { tl.remove(); };
+    }, [map, theme]);
+    return null;
+}
 // Fits the rendered geometry and keeps the thumb static (no pan/zoom).
 function FitGeometry({ data }) {
     const map = (0, react_leaflet_1.useMap)();
@@ -85,6 +108,6 @@ function GeoThumbCell({ geometry, value, width = geoConstants_1.GIS_THUMB_SIZE.w
             borderColor: 'divider',
         } },
         react_1.default.createElement(react_leaflet_1.MapContainer, { center: [-14.2, -51.9], zoom: 4, style: { width: '100%', height: '100%' }, zoomControl: false, attributionControl: false, dragging: false, scrollWheelZoom: false, doubleClickZoom: false, boxZoom: false, keyboard: false, touchZoom: false },
-            react_1.default.createElement(react_leaflet_1.TileLayer, { attribution: "\u00A9 OpenStreetMap contributors", url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" }),
-            react_1.default.createElement(FitGeometry, { data: data }))));
+            react_1.default.createElement(FitGeometry, { data: data }),
+            react_1.default.createElement(BaseLayer, null))));
 }

package/dist/components/forms/inputs/MapGeometryPicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapGeometryPicker.d.ts","sourceRoot":"","sources":["../../../../src/components/forms/inputs/MapGeometryPicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAOxE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,sBAAsB,CAAC;AAGhE,OAAO,0BAA0B,CAAC;AAElC,OAAO,cAAc,CAAC;AACtB,OAAO,oCAAoC,CAAC;AAI5C,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAiBjE,eAAO,MAAM,cAAc,EAAE,WAAW,EAgBvC,CAAC;AASF,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC3C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAgWD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,QAAQ,EACR,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,UAAU,EACV,EAAE,EACF,MAAY,GACb,EAAE,sBAAsB,qBA+HxB"}
+{"version":3,"file":"MapGeometryPicker.d.ts","sourceRoot":"","sources":["../../../../src/components/forms/inputs/MapGeometryPicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAOxE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,sBAAsB,CAAC;AAGhE,OAAO,0BAA0B,CAAC;AAElC,OAAO,cAAc,CAAC;AACtB,OAAO,oCAAoC,CAAC;AAI5C,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAiBjE,eAAO,MAAM,cAAc,EAAE,WAAW,EAgBvC,CAAC;AASF,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC3C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAuWD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,QAAQ,EACR,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,UAAU,EACV,EAAE,EACF,MAAY,GACb,EAAE,sBAAsB,qBA+HxB"}

package/dist/components/forms/inputs/MapGeometryPicker.js

@@ -268,9 +268,18 @@ function DrawEditor({ geometry, value, onChange, }) {
             featureGroup.addLayer(layer);
             applyBehaviors(layer);
         });
-        const bounds = featureGroup.getBounds();
-        if (bounds.isValid())
-            map.fitBounds(bounds, { padding: [40, 40] });
+        const g = geometryRef.current;
+        if (g === 'point') {
+            // Center on the marker at a contextual zoom, not tight-fit.
+            const center = featureGroup.getBounds().getCenter();
+            if (center)
+                map.setView(center, 14);
+        }
+        else {
+            const bounds = featureGroup.getBounds();
+            if (bounds.isValid())
+                map.fitBounds(bounds, { padding: [40, 40] });
+        }
     };
     (0, react_1.useEffect)(() => {
         applyLeafletDrawLocalization(texts.geometry);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drf-react-by-schema",
-  "version": "0.28.11",
+  "version": "0.28.13",
   "description": "Components and Tools for building a React App having Django Rest Framework (DRF) as server",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",