-
Notifications
You must be signed in to change notification settings - Fork 3
Feature/diplan UI #254
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Feature/diplan UI #254
Changes from all commits
Commits
Show all changes
97 commits
Select commit
Hold shift + click to select a range
5dd2aaa
Add basic structure for diplan-ui and new plugin GeoEditing
dopenguin f454beb
Add possibly required vite config for diplanung-style
dopenguin b62440c
Add GeoEditing plugin to diplan and css rules of diplanung-style
dopenguin 92e0d8e
Make diplanung-style usable through a temporary workaround
dopenguin e3cbafd
Fix diplanung-style overwriting vuetify styles
dopenguin 349dbb0
Use diplanung-style only for diplan-ui to not interfere with vuetify
dopenguin 6852d68
Make the direction the content of the attributions opens configurable
dopenguin 0e76d90
Fix issue of plugins placed in the middle not being centered
dopenguin 42b0838
Use layoutTag in place of a new config parameter for identification
dopenguin 19de679
Add diplan-ui client to the overview
dopenguin dfd287f
Add new DiPlan IconMenu, remove Fullscreen and add GeoEditing to Menu
dopenguin 67795d5
Re-implement LayerChooser for diplan-ui
dopenguin f77adb1
Add possibility to change the component of the layer chooser by config
dopenguin fc8f223
Import diplan style in setup file of the dev view
dopenguin 773d394
Change the height of the wrapper based on the value of the design
dopenguin 74c8565
Add possibility to change the component of the iconMenu by config
dopenguin f17cf5d
Add missing type for showZoomSlider to ZoomGetters
dopenguin 13d8f42
Add possibility to change the component of zoom by config
dopenguin f267799
Add diplan styled zoom buttons
dopenguin 4afe34b
Make setMode and setDrawMode async preventing race conditions
dopenguin 4a4e1c5
Move dev config closer to wanted configuration
dopenguin 768f34d
Add hints for geoEditing ui
dopenguin 5827444
Rename hints to tools for broader usage
dopenguin 4e545da
Add hints for Diplan LayerChooser
dopenguin 1e3ed93
Add renderType to define where the GeoEditing plugin will be rendered
dopenguin 19b6431
Comment unused locales
dopenguin 1b50bc1
Split GeoEditing in two possible views and add first functionality
dopenguin 9d70a59
Add MenuView to GeoEditing
dopenguin d5122db
Merge branch 'main' into feature/diplan-ui
dopenguin b801bfd
Move getBackgroundsAndMasks to a separate file
dopenguin 5788e97
Remove unused interface
dopenguin 49ab19b
Reorder types alphanumerically
dopenguin 5aaac41
Add new getter configuration that wraps the rootGetter
dopenguin 98fbb00
Use new local getter for configuration
dopenguin 7b6d088
Add possibility to use a different component for the AttributionsButton
dopenguin 86d7664
Add new AttributionButton for diplan ui
dopenguin a6e48a3
Add possibility to configure a different component for AddressSearch
dopenguin 2c4b6ec
Merge branch 'main' into feature/diplan-ui
dopenguin 6d34bc8
Align diplan-ui setup with dev setup
dopenguin 7dcc089
Add diplan address search ui
dopenguin 5d71202
Merge branch 'main' into feature/diplan-ui
dopenguin 07c27fe
Merge branch 'main' into feature/diplan-ui
dopenguin c912241
Merge branch 'main' into feature/diplan-ui
dopenguin a16c8ef
Add todos for another iteration
dopenguin 37cf816
Reduce height of polarstern-wrapper
dopenguin 31151b0
Adjust build mode so that different configurations can be properly used
dopenguin 5d74ede
Add both variations for the larger diplan-ui
dopenguin 208b210
Change address search input element to have the label move
dopenguin ca1896a
Add translate to geoEditing
dopenguin 953efa6
Remove parcel as this is already implemented somewhere else
dopenguin 1ca5d30
Remove last trace of geoEditing mode parcel
dopenguin b093306
Change title for examples
dopenguin b2732dd
Remove note as @polar/plugin-layer-chooser now offers configuration
dopenguin 02deabe
Keeping it real and grammatically correct 💁
dopenguin b477a49
Remove redundant css class mid-mid
dopenguin f097826
Merge branch 'main' into feature/diplan-ui
dopenguin 3ef0a33
Remove redundant curly-braces
dopenguin 927cd01
Merge branch 'main' into feature/diplan-ui
warm-coolguy b1459b2
Extend LayerConfiguration from necessary PluginOptions
dopenguin 2098257
Re-add @polar/plugin-export
dopenguin f6a3387
Remove not working imports of styles
dopenguin 9365506
Always add @polar/plugin-toast
dopenguin cea505f
Re-add empty class mid-mid
dopenguin 083d646
Precompile diplanung-style to have it include :host for variables
dopenguin 912ed18
Merge branch 'main' into feature/diplan-ui
dopenguin 73d5b10
Rename data value 'open' to 'active'
dopenguin 4d35f92
Deactivate any active tool if the menu window is closed
dopenguin 8e71847
Remove empty rule
dopenguin cda40c2
Merge branch 'main' into feature/diplan-ui
dopenguin a2434ea
Move the content of the base address search component to a separate file
dopenguin 279eca8
Remove unused files
dopenguin 5c5bbbd
Fix underlapping issue
dopenguin 16fc3a4
Remove redundant comment
dopenguin 3cfa769
Change changelog entry
dopenguin 64ed372
Use the plugins AttributionButton and simply style it in diplan
dopenguin d5c2092
Add duplicate to GeoEditing
dopenguin 1570a05
Remove comments
dopenguin a04602a
Merge branch 'main' into feature/diplan-ui
dopenguin 75d9bed
Merge branch 'main' into feature/diplan-ui
dopenguin 131706c
Expose ZoomButtonContainer as a new export for custom implementations
dopenguin d64ea9f
Use ZoomButtonContainer and style it according to diplan design
dopenguin cd02a18
Expose IconMenuWrapper as a new export for custom implementations
dopenguin 0e22006
Remove unused parts from the Zoom.vue in diplan
dopenguin 2ce602f
Add missing z-index to MenuView of GeoEditing
dopenguin 2644e6f
Remove IconMenuWrapper.vue
dopenguin efa9c6d
Change implementation of component to buttonComponent
dopenguin ce2437d
Add buttonComponent to IconMenuGetters
dopenguin 02d6d5d
Remove (seemingly) obsolete v-deep override
dopenguin 66492d2
Fix UI of diplan LayerChooser
dopenguin 762cc90
Actually fix diplan layerChooser UI
dopenguin 98404a4
Fix positioning of GeoEditing in MenuView
dopenguin b525f95
Change background-color of GeoEditing to #fff to be inline with the rest
dopenguin 06067c0
Add IconMenuButton for diplan
dopenguin bf150c9
Expose Options.vue as LayerChooserOptions and use it in diplan
dopenguin 0ef61b2
Expose LayerWrapper.vue as LayerChooserLayerWrapper and use it in diplan
dopenguin 405f8d5
Merge branch 'main' of https://github.com/Dataport/polar into feature…
warm-coolguy 3999525
Add information regarding polar-ui style
dopenguin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
171 changes: 171 additions & 0 deletions
171
packages/clients/diplan/example/diplan-ui-one/config.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,171 @@ | ||
// service id map to avoid typos, ease renames | ||
const basemap = 'basemapde_farbe' | ||
const xplanwms = 'xplanwms' | ||
const xplanwfs = 'xplanwfs' | ||
const flurstuecke = 'flurstuecke' | ||
const bstgasleitung = 'bst_gasleitung' | ||
|
||
export default { | ||
// masterportalAPI parameters | ||
startResolution: 264.583190458, | ||
startCenter: [561210, 5932600], | ||
extent: [ | ||
248651.73157077, 5227198.20287631, 928366.12236557, 6118661.62507136, | ||
], | ||
// diplan-specific configuration example (see API.md) | ||
diplan: { | ||
mergeToMultiGeometries: true, | ||
validateGeoJson: true, | ||
metaServices: [ | ||
{ | ||
id: flurstuecke, | ||
propertyNames: ['land', 'gemarkung', 'regbezirk', 'kreis', 'gemeinde'], | ||
aggregationMode: 'unequal', | ||
}, | ||
], | ||
}, | ||
// general POLAR parameters | ||
locales: [ | ||
{ | ||
type: 'de', | ||
resources: { | ||
diplan: { | ||
layers: { | ||
[basemap]: 'BasemapDE', | ||
[xplanwms]: 'XPlanWMS', | ||
[xplanwfs]: 'XPlanSynWFS', | ||
[flurstuecke]: 'Flurstücke', | ||
[bstgasleitung]: 'BST Gasleitung', | ||
}, | ||
attributions: { | ||
[basemap]: `$t(diplan.layers.${basemap}) © GeoBasis-DE / BKG <YEAR> CC BY 4.0`, | ||
[xplanwms]: `$t(diplan.layers.${xplanwms}) © ???`, | ||
[xplanwfs]: `$t(diplan.layers.${xplanwfs}) © ???`, | ||
[flurstuecke]: `$t(diplan.layers.${flurstuecke}) © ???`, | ||
[bstgasleitung]: `$t(diplan.layers.${bstgasleitung}) © ???`, | ||
}, | ||
}, | ||
}, | ||
}, | ||
], | ||
addressSearch: { | ||
displayComponent: true, | ||
searchMethods: [ | ||
{ | ||
queryParameters: { | ||
searchAddress: true, | ||
searchStreets: true, | ||
searchHouseNumbers: true, | ||
}, | ||
type: 'mpapi', | ||
url: 'https://geodienste.hamburg.de/HH_WFS_GAGES?service=WFS&request=GetFeature&version=2.0.0', | ||
}, | ||
], | ||
groupProperties: { | ||
defaultGroup: { | ||
label: 'Suchbegriff', | ||
}, | ||
}, | ||
minLength: 3, | ||
waitMs: 300, | ||
}, | ||
layers: [ | ||
{ | ||
id: basemap, | ||
visibility: true, | ||
type: 'background', | ||
name: `diplan.layers.${basemap}`, | ||
}, | ||
{ | ||
id: xplanwms, | ||
visibility: true, | ||
type: 'mask', | ||
name: `diplan.layers.${xplanwms}`, | ||
}, | ||
{ | ||
id: xplanwfs, | ||
visibility: false, | ||
type: 'mask', | ||
name: `diplan.layers.${xplanwfs}`, | ||
}, | ||
{ | ||
id: flurstuecke, | ||
visibility: false, | ||
// TODO available from 7, but only starts loading from 8 - bug or skill issue? → POLAR-431 | ||
minZoom: 7, | ||
type: 'mask', | ||
name: `diplan.layers.${flurstuecke}`, | ||
}, | ||
{ | ||
id: bstgasleitung, | ||
visibility: false, | ||
type: 'mask', | ||
name: `diplan.layers.${bstgasleitung}`, | ||
}, | ||
], | ||
attributions: { | ||
layerAttributions: [ | ||
{ | ||
id: basemap, | ||
title: `diplan.attributions.${basemap}`, | ||
}, | ||
{ | ||
id: xplanwms, | ||
title: `diplan.attributions.${xplanwms}`, | ||
}, | ||
{ | ||
id: xplanwfs, | ||
title: `diplan.attributions.${xplanwfs}`, | ||
}, | ||
{ | ||
id: flurstuecke, | ||
title: `diplan.attributions.${flurstuecke}`, | ||
}, | ||
{ | ||
id: bstgasleitung, | ||
title: `diplan.attributions.${bstgasleitung}`, | ||
}, | ||
], | ||
}, | ||
draw: { | ||
lassos: [ | ||
{ | ||
id: flurstuecke, | ||
}, | ||
{ | ||
id: xplanwfs, | ||
}, | ||
], | ||
snapTo: [xplanwfs, flurstuecke], | ||
style: { | ||
fill: { color: 'rgb(51 117 212 / 50%)' }, | ||
stroke: { | ||
color: '#3375d4', | ||
width: 2, | ||
}, | ||
circle: { | ||
radius: 7, | ||
fillColor: 'rgb(51 117 212 / 50%)', | ||
}, | ||
}, | ||
}, | ||
gfi: { | ||
mode: 'bboxDot', | ||
layers: { | ||
[xplanwms]: { | ||
geometry: true, | ||
window: true, | ||
properties: ['xpPlanName'], | ||
}, | ||
[xplanwfs]: { | ||
geometry: true, | ||
window: true, | ||
properties: ['name'], | ||
}, | ||
}, | ||
coordinateSources: [ | ||
'plugin/pins/transformedCoordinate', | ||
'plugin/pins/coordinatesAfterDrag', | ||
], | ||
}, | ||
} |
128 changes: 128 additions & 0 deletions
128
packages/clients/diplan/example/diplan-ui-one/index.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<!-- test page for build --> | ||
<head> | ||
<meta charset="utf-8" /> | ||
<title>@polar/client-diplan</title> | ||
<link rel="stylesheet" href="../style.css"> | ||
<style> | ||
#polarstern-wrapper { | ||
height: 90vh; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<nav></nav> | ||
<header> | ||
<h1>Testseite <code>@polar/client-diplan</code> (Diplan UI - Variation One)</h1> | ||
</header> | ||
<div id="somethingnice"></div> | ||
<main> | ||
<section> | ||
<h2 class="padded-x">Beispielinstanz</h2> | ||
<div class="padded-x"> | ||
<h3>Steuerung von außen</h3> | ||
<fieldset> | ||
<legend>POLAR-Standardfunktionen</legend> | ||
<button id="action-plus">+</button> | ||
<button id="action-minus">-</button> | ||
<button id="action-toast">Toast</button> | ||
<button id="action-load-geojson">GeoJSON hinzufügen</button> | ||
<button id="action-zoom-to-all">Zoome auf Zeichnung</button> | ||
<label> | ||
Adresssuche (erstbestes Ergebnis): | ||
<input id="action-address-search-filler"/> | ||
</label> | ||
</fieldset> | ||
<fieldset> | ||
<legend>DiPlan-Funktionen</legend> | ||
<button id="action-lasso">Lasso-Funktion</button> | ||
<button id="action-cut-polygons">Cut polygons</button> | ||
<button id="action-duplicate-polygons">Duplicate polygons</button> | ||
<button id="action-merge-polygons">Merge polygons</button> | ||
</fieldset> | ||
<div>Active extended draw mode: <span id="active-draw-mode"></span></div> | ||
</div> | ||
<h3 class="padded-x">Klient</h3> | ||
<div id="polarstern"> | ||
<noscript>Bitte benutzen Sie einen Browser mit aktiviertem JavaScript, um den Kartenklienten zu nutzen.</noscript> | ||
</div> | ||
</section> | ||
<section class="padded-x"> | ||
<h2>Informationen aus Kartenklient</h2> | ||
<p>Subscriptions werden i.d.R. mit JSON-fähigen Objekten beantwortet. Die untere Tabelle stellt einige ausgewählte Karteninhalte als Text dar.</p> | ||
<table class="styled-table"> | ||
<thead> | ||
<tr> | ||
<th>Schlüssel</th> | ||
<th>Wert (als Text)</th> | ||
<th>Kommentar</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr> | ||
<td><code>diplan/revisedDrawExport</code></td> | ||
<td id="subscribed-revised-draw-export">uninitialized</td> | ||
<td>Der überarbeitete Export des Draw-Tools mit diplanspezifischen Anpassungen.</td> | ||
</tr> | ||
<tr> | ||
<td><code>diplan/revisionInProgress</code></td> | ||
<td id="subscribed-revision-in-progress">uninitialized</td> | ||
<td>Indikator, ob ein Ladevorgang für die weiteren Anpassungen der Draw-Ausagbe gerade läuft.</td> | ||
</tr> | ||
<tr> | ||
<td><code>diplan/simpleGeometryValidity</code></td> | ||
<td id="subscribed-simple-geometry-validity">uninitialized</td> | ||
<td>Simple-Geometry-Konformität</td> | ||
</tr> | ||
<tr> | ||
<td><code>plugin/export/exportedMap</code></td> | ||
<td><a id="subscribed-export-a" download="polar_screenshot.png" href=""><img id="subscribed-export-img" /></a></td> | ||
<td>Screenshot des aktuellen Kartenausschnitts. Produzierbar durch Klick auf den unteren linken "Export"-Button.</td> | ||
</tr> | ||
<tr> | ||
<td><code>plugin/zoom/zoomLevel</code></td> | ||
<td id="subscribed-zoom">uninitialized</td> | ||
<td>Zoomstufe der <a target="_blank" href="https://openlayers.org/en/latest/apidoc/module-ol_View-View.html#getZoom">OpenLayers/View</a> als <code>Number</code></td> | ||
</tr> | ||
<tr> | ||
<td><code>plugin/gfi/featureInformation</code></td> | ||
<td id="subscribed-gfi">uninitialized</td> | ||
<td>Wert der aktuellen <code>GetFeatureInformation</code>-Antwort(en) als <code>Record<LayerId, Feature[]></code></td> | ||
</tr> | ||
<tr> | ||
<td><code>plugin/draw/featureCollection</code></td> | ||
<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> | ||
</main> | ||
<footer>At solmen va esser necessi far uniform grammatica, pronunciation e plu sommun paroles.</footer> | ||
<link rel="stylesheet" src="../../dist/polar-client.css"> | ||
<script type="module"> | ||
import diplanMapClient from '../../dist/client-diplan.js' | ||
import services from '../services.js' | ||
import config from './config.js' | ||
import setup from './setup.js' | ||
|
||
setup(diplanMapClient, services, config) | ||
</script> | ||
</body> | ||
</html> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.