From 834307b8de2abe85815dd834274494395d419f53 Mon Sep 17 00:00:00 2001 From: Tobias Drisch Date: Thu, 7 Dec 2023 17:56:21 +0100 Subject: [PATCH 1/4] added descriptions for DeckGl and IconLayer --- .../MlDeckGlTerrainLayer.meta.json | 26 +++++++++---------- .../MlIconLayer/MlIconLayer.meta.json | 26 +++++++++---------- yarn.lock | 10 +++++++ 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/components/MlDeckGlTerrainLayer/MlDeckGlTerrainLayer.meta.json b/src/components/MlDeckGlTerrainLayer/MlDeckGlTerrainLayer.meta.json index 6a1147d..4a6fc3e 100644 --- a/src/components/MlDeckGlTerrainLayer/MlDeckGlTerrainLayer.meta.json +++ b/src/components/MlDeckGlTerrainLayer/MlDeckGlTerrainLayer.meta.json @@ -1,15 +1,15 @@ { - "name": "MlDeckGlTerrainLayer", - "title": "3D topographical layer", - "description": "", - "i18n": { - "de": { - "title": "3D Topo Ebene", - "description": "" - } - }, - "tags": ["Map add-on"], - "category": "add-ons", - "type": "component", - "price": 5000 + "name": "MlDeckGlTerrainLayer", + "title": "3D topographical layer", + "description": "Move along a Camera path through a 3-dimensional Layer", + "i18n": { + "de": { + "title": "3D Topo Ebene", + "description": "Verfolgt eine Kameraroute in einer dreidimensionalen Ebene" + } + }, + "tags": ["Map add-on"], + "category": "add-ons", + "type": "component", + "price": 5000 } diff --git a/src/components/MlIconLayer/MlIconLayer.meta.json b/src/components/MlIconLayer/MlIconLayer.meta.json index e1e8fdb..c84e895 100644 --- a/src/components/MlIconLayer/MlIconLayer.meta.json +++ b/src/components/MlIconLayer/MlIconLayer.meta.json @@ -1,15 +1,15 @@ { - "name": "MlIconLayer", - "title": "Animated marker layer", - "description": "", - "i18n": { - "de": { - "title": "Animierte Marker Ebene", - "description": "" - } - }, - "tags": ["Map layer"], - "category": "layer", - "type": "component", - "price": 0 + "name": "MlIconLayer", + "title": "Animated marker layer", + "description": "A Layer displaying animated Symbols", + "i18n": { + "de": { + "title": "Animierte Marker Ebene", + "description": "Ebene zur Darstellung animierter Symbole" + } + }, + "tags": ["Map layer"], + "category": "layer", + "type": "component", + "price": 0 } diff --git a/yarn.lock b/yarn.lock index 26262f1..3a45fe9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6244,6 +6244,11 @@ dependencies: "@types/node" "*" +"@types/elasticlunr@^0.9.8": + version "0.9.9" + resolved "https://registry.yarnpkg.com/@types/elasticlunr/-/elasticlunr-0.9.9.tgz#3cdf945e3eaf28fd18f8fd8fcfadbbfa6babcce3" + integrity sha512-59TMY+u8jKLqSg0AZStCz4n8A7l/nVenmum6fFQa9bUOH26GNMEgDseiN813IxXmTQ0AivefnMlbileBggCf5g== + "@types/enzyme@^3.10.12": version "3.10.18" resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.18.tgz#86010e7cb56cf1450dd391b8cc3a788f6a6fadef" @@ -10903,6 +10908,11 @@ ejs@^3.1.6: dependencies: jake "^10.8.5" +elasticlunr@^0.9.5: + version "0.9.5" + resolved "https://registry.yarnpkg.com/elasticlunr/-/elasticlunr-0.9.5.tgz#65541bb309dddd0cf94f2d1c8861b2be651bb0d5" + integrity sha512-5YM9LFQgVYfuLNEoqMqVWIBuF2UNCA+xu/jz1TyryLN/wmBcQSb+GNAwvLKvEpGESwgGN8XA1nbLAt6rKlyHYQ== + electron-to-chromium@^1.4.601: version "1.4.603" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.603.tgz#446907c21d333b55d0beaba1cb5b48430775a8a7" From eda09aeb330027bc32b793f3eaa1fe424fcd269d Mon Sep 17 00:00:00 2001 From: Tobias Drisch Date: Fri, 8 Dec 2023 15:51:32 +0100 Subject: [PATCH 2/4] used CSS to adjust topbar color of MlDeckGlTerrain --- src/App.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/App.css b/src/App.css index 7914e0b..07d0772 100644 --- a/src/App.css +++ b/src/App.css @@ -1,3 +1,7 @@ +.css-tjahdp-MuiPaper-root-MuiAppBar-root{ + background-color: #fafafa !important +} + /** * #root { background-color: #000; From bfbc69d91a701b9d939e2c530773205fd768a7ef Mon Sep 17 00:00:00 2001 From: Tobias Drisch Date: Fri, 8 Dec 2023 16:16:18 +0100 Subject: [PATCH 3/4] switched all controls to english --- .../MlDeckGlTerrainLayer.stories.js | 316 +++++++++--------- 1 file changed, 165 insertions(+), 151 deletions(-) diff --git a/src/components/MlDeckGlTerrainLayer/MlDeckGlTerrainLayer.stories.js b/src/components/MlDeckGlTerrainLayer/MlDeckGlTerrainLayer.stories.js index 235d751..66d4429 100644 --- a/src/components/MlDeckGlTerrainLayer/MlDeckGlTerrainLayer.stories.js +++ b/src/components/MlDeckGlTerrainLayer/MlDeckGlTerrainLayer.stories.js @@ -113,159 +113,173 @@ const Template = (args) => { const [openSidebar, setOpenSidebar] = useState(true); return ( - <> - - {showLayer ? : null} - {showRoute ? ( - - ) : null} - - + + + } + /> + + setShowRoute(!showRoute)}> + + {showRoute ? "Hide Camera path" : "Show Camera path"} + + + + + setState((current) => { + return { ...current, pause: false }; + }) + } > - Terrain Layer - - - - } - /> - - setShowRoute(!showRoute)}> - - {showRoute ? "Route ausblenden" : "Route einblenden"} - - - - - setState((current) => { - return { ...current, pause: false }; - }) - } - > - Start - - - setState((current) => { - return { ...current, pause: true }; - }) - } - > - Pause - - { - setState((current) => { - return { ...current, pause: true, pitch: 60, zoom: 11, speed: 20 }; - }); - setTimeout(() => { - CameraFollowPath.reset(); - }, 50); - }} - > - Reset - - - - Zoom: - - { - setState((current) => { - return { ...current, zoom: value }; - }); - }} - getAriaValueText={(value) => value} - aria-labelledby="discrete-slider" - //valueLabelDisplay="auto" - step={1} - marks={marks} - min={8} - max={13} - sx={{ - marginTop: "20px", - paddingBottom: "20px", - marginRight: "10px", - maxWidth: "200px", - }} - /> - - - - Speed: - - { - setState((current) => { - return { ...current, speed: value }; - }); - }} - getAriaValueText={(value) => value} - aria-labelledby="discrete-slider2" - //valueLabelDisplay="auto" - step={5} - marks - min={1} - max={60} - sx={{ - marginRight: "10px", - maxWidth: "200px", - }} - /> - - { - if (state.pitch === 0) { - setState((current) => { - return { ...current, pitch: 60 }; - }); - } else { - setState((current) => { - return { ...current, pitch: 0 }; - }); - } - }} - > - {state.pitch === 0 ? "3D" : "2D"} - - - - + Pause + + { + setState((current) => { + return { + ...current, + pause: true, + pitch: 60, + zoom: 11, + speed: 20, + }; + }); + setTimeout(() => { + CameraFollowPath.reset(); + }, 50); + }} + > + Reset + + + + Zoom: + + { + setState((current) => { + return { ...current, zoom: value }; + }); + }} + getAriaValueText={(value) => value} + aria-labelledby="discrete-slider" + //valueLabelDisplay="auto" + step={1} + marks={marks} + min={8} + max={13} + sx={{ + marginTop: "20px", + paddingBottom: "20px", + marginRight: "10px", + maxWidth: "200px", + }} + /> + + + + Speed: + + { + setState((current) => { + return { ...current, speed: value }; + }); + }} + getAriaValueText={(value) => value} + aria-labelledby="discrete-slider2" + //valueLabelDisplay="auto" + step={5} + marks + min={1} + max={60} + sx={{ + marginRight: "10px", + maxWidth: "200px", + }} + /> + + { + if (state.pitch === 0) { + setState((current) => { + return { ...current, pitch: 60 }; + }); + } else { + setState((current) => { + return { ...current, pitch: 0 }; + }); + } + }} + > + {state.pitch === 0 ? "3D" : "2D"} + + + + ); }; From 7c0d52a8c6d0eccc34b771e8f86d6b6fcc14adf1 Mon Sep 17 00:00:00 2001 From: Tobias Drisch Date: Tue, 20 Feb 2024 15:58:42 +0100 Subject: [PATCH 4/4] added a description for the catalogue demo --- .../MlLaermkarte/MlLaemkarte.meta.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/applications/MlLaermkarte/MlLaemkarte.meta.json b/src/applications/MlLaermkarte/MlLaemkarte.meta.json index 4d929ce..40ed4d0 100644 --- a/src/applications/MlLaermkarte/MlLaemkarte.meta.json +++ b/src/applications/MlLaermkarte/MlLaemkarte.meta.json @@ -1,16 +1,16 @@ { - "name": "MlLaermkarte", - "title": "Noise map of Bonn", - "description": "", - "i18n": { - "de": { - "title": "Lärmkarte von Bonn", - "description": "" - } - }, - "tags": [], - "category": "", - "type": "application", - "components": ["MlFillExtrusionLayer", "MlCameraFollowPath"], - "price": 12000 + "name": "MlLaermkarte", + "title": "Noise map of Bonn", + "description": "A WebGis application providing a detailed visualisation of the noise level within different parts of the former german capital", + "i18n": { + "de": { + "title": "Lärmkarte von Bonn", + "description": "Eine WebGis Anwendung, die den Lautstärkepegel in Bonn grafisch darstellt" + } + }, + "tags": [], + "category": "", + "type": "application", + "components": ["MlFillExtrusionLayer", "MlCameraFollowPath"], + "price": 12000 }