Skip to content

Commit

Permalink
- Updated MapStore2 to <a href="https://github.com/geosolutions-it/M…
Browse files Browse the repository at this point in the history 
…apStore2/commit/8d8f455e4e9c8fccba7f102d7c6bfbb9d2243be9">2020.02.00</a>
  • Loading branch information
afabiani committed May 5, 2020
1 parent ba9caf7 commit ae50366
Show file tree
Hide file tree
Showing 46 changed files with 657 additions and 186 deletions.
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/MapStore2
Submodule MapStore2 updated 209 files
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ set -e

npx rimraf package-lock.json npm-shrinkwrap.json node_modules
npm update
npm install
yarn install
npm run compile
npm run lint
4 changes: 3 additions & 1 deletion geonode_mapstore_client/client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@
"vis": "4.21.0",
"w3c-schemas": "1.3.1",
"wellknown": "0.5.0",
"xml2js": "0.4.17"
"xml2js": "0.4.17",
"xmldom": "0.3.0",
"xpath": "0.0.27"
}
}
7 changes: 6 additions & 1 deletion geonode_mapstore_client/client/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15185,7 +15185,7 @@ xmlcreate@^2.0.3:
resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.3.tgz#df9ecd518fd3890ab3548e1b811d040614993497"
integrity sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ==

xmldom@>=0.1.21:
xmldom@0.3.0, xmldom@>=0.1.21:
version "0.3.0"
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.3.0.tgz#e625457f4300b5df9c2e1ecb776147ece47f3e5a"
integrity sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g==
Expand All @@ -15205,6 +15205,11 @@ xmlhttprequest@1.x.x:
resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=

xpath@0.0.27:
version "0.0.27"
resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92"
integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==

"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
Expand Down
55 changes: 51 additions & 4 deletions geonode_mapstore_client/static/mapstore/MapStore2/web/client/data.de-DE.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,12 @@
"right": "Recht",
"bottom": "Bottom",
"top": "Oben"
},
"legendOptions": {
"title": "Legende",
"legendWidth": "Breite",
"legendHeight": "Höhe",
"legendPreview": "Vorschau"
}
},
"longitude": "Länge",
Expand Down Expand Up @@ -474,14 +480,37 @@
"identifier": "Kennung",
"title": "Titel",
"abstract": "Zusammenfassung",
"purpose": "Zweck",
"source": "Quelle",
"createdDate": "Erstellungsdatum",
"lastRevisionDate": "Datum der letzten Überarbeitung",
"pointsOfContact": "Ansprechpartner",
"individualName": "Individueller Name",
"organisationName": "Name der Organisation",
"contactInfo": "Kontaktinformationen",
"phone": "Telefonnummer",
"deliveryPoints": "Lieferpunkte",
"city": "Stadt",
"postalCode": "Postleitzahl",
"country": "Land",
"URL": "URL",
"role": "Rolle",
"hoursOfService": "Öffnungszeiten",
"electronicMailAddress": "E-Mail-Addresse",
"subject": "Betreff",
"type": "Typ",
"creator": "Ersteller",
"defaultPropName": "Eigentum=\"{propName}\"",
"toolLayerMetadataTooltip": "Zeigen Sie die Metadaten der ausgewählten Ebene an",
"layerMetadataPanelTitle": "Ebenenmetadaten",
"notification": {
"warnigGetMetadataRecordById": "Fehler bei der Metadatensuche"
}
},
"itemTitles": {
"pointsOfContact": "Kontakt",
"default": "Artikel"
},
"emptyMetadata": "Keine Metadaten verfügbar"
},
"thematic": {
"classification_field": "Klassifizierungsfeld:",
Expand Down Expand Up @@ -573,18 +602,22 @@
"identifyRevGeocodeSubmitText": "Mehr Informationen",
"identifyRevGeocodeCloseText": "Schliessen",
"identifyRevGeocodeError": "Konnte nicht geocodiert werden",
"identifyEdit": "Bearbeiten",
"getFeatureInfoError": {
"title": "Ooops! Etwas ist schiefgelaufen.",
"text": "Ein Fehler ist während dieser <b>GetFeatureInfo</b> Anfrage aufgetreten"
},
"noFeatureInfo": "Es sind keine Informationen für den gewählten Punkt verfügbar",
"noFeatureInfo": "Zu diesem Punkt sind keine Informationen verfügbar",
"noInfoForLayers": "Für die folgenden Ebenen gibt es keine Objekte: ",
"history":{
"barLabel": "Kartenverlauf",
"undoBtnTooltip": "Gehe zurück",
"redoBtnTooltip": "Gehe vorwärts"
},
"infoFormatLbl": "Identifiziere das Antwortformat",
"infoTriggerLabel": "Auslöseereignis für Identifizieren",
"click": "Click",
"hover": "Hover",
"measureSupport": {
"continueLine": "Klicken Sie auf, um mit dem Zeichnen der Linie fortzufahren",
"continuePolygon": "Klicken Sie, um mit dem Zeichnen des Polygons fortzufahren",
Expand All @@ -595,6 +628,7 @@
"MeasureLength": "Distanz messen",
"MeasureArea": "Fläche messen",
"MeasureBearing": "Richtung messen",
"MeasureTrueBearing": "Richtung (True Bearing) messen",
"tooltip": "Länge und Fläche messen",
"title": "Messen",
"lengthButtonText": "Linie",
Expand All @@ -603,6 +637,7 @@
"lengthLabel": "Länge",
"areaLabel": "Fläche",
"bearingLabel": "Richtung",
"trueBearingLabel": "Richtung (True Bearing)",
"formula": "Formel zur Entfernungsberechnung",
"showLabel": "Zeige Bezeichnungsetikett",
"addAsAnnotation": "Als Anmerkung hinzufügen",
Expand Down Expand Up @@ -638,6 +673,7 @@
"s_attributes": "Attribute",
"s_sort": "Sortiere nach",
"s_max_features": "Max. Objekte",
"s_max_zoom": "Max. Zoomstufe",
"s_wfs_props_label" : "WFS-Service-Eigenschaften",
"s_wfs_opt_props_label" : "Optionale Eigenschaften",
"s_result_props_label": "Ergebnisanzeigeeigenschaften",
Expand Down Expand Up @@ -1408,7 +1444,12 @@
"default": "Beispiele...",
"string": "Geben Sie Text ein, um Ergebnisse zu filtern ...",
"number": "Geben Sie eine Zahl oder einen Ausdruck ein. Examples: 10, > 2, < 10",
"date": "Geben Sie ein Datum oder einen Ausdruck ein. Verwenden Sie {format} für das Datum."
"date": "Geben Sie ein Datum oder einen Ausdruck ein. Verwenden Sie {format} für das Datum.",
"geometry": {
"disabled": "Filterklick auf die Karte",
"enabled": "Klicken Sie auf die Karte, um die Ergebnisse zu filtern",
"applied": "Entfernen Sie den Filter per Mausklick"
}
}
},
"toolbar": {
Expand Down Expand Up @@ -2357,6 +2398,10 @@
"description": "Ermöglicht dem Benutzer das Aktivieren / Deaktivieren von Benutzererweiterungen",
"title": "User Extensions"
},
"UserSession": {
"title": "User Session",
"description": "Aktiviert eine automatisch gespeicherte Benutzersitzung für jeden Kontext."
},
"Version": {
"description": "Zeigt die Version von MapStore in den Karteneinstellungen an",
"descriptionGeorchestra": "Zeigt die Version von GeOrchestra in den Karteneinstellungen an",
Expand Down Expand Up @@ -2676,7 +2721,9 @@
"titleContext": "Entfernen der Benutzersitzung fehlgeschlagen",
"defaultMessage": "Unbekannter Fehler"
},
"successRemoved": "Benutzersitzung entfernt"
"successRemoved": "Benutzersitzung entfernt",
"remove": "Benutzersitzung zurücksetzen",
"confirmRemove": "Möchten Sie die Standardkonfiguration wirklich wiederherstellen?"
}
}
}
55 changes: 51 additions & 4 deletions geonode_mapstore_client/static/mapstore/MapStore2/web/client/data.en-US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@
"right": "Right",
"bottom": "Bottom",
"top": "Top"
},
"legendOptions": {
"title": "Legend",
"legendWidth": "Width",
"legendHeight": "Height",
"legendPreview": "Preview"
}
},
"longitude": "Longitude",
Expand Down Expand Up @@ -473,14 +479,37 @@
"identifier": "Identifier",
"title": "Title",
"abstract": "Abstract",
"purpose": "Purpose",
"source": "Source",
"createdDate": "Created Date",
"lastRevisionDate": "Last Revision Date",
"pointsOfContact": "Points of Contact",
"individualName": "Individual Name",
"organisationName": "Organisation Name",
"contactInfo": "Contact Info",
"phone": "Phone Number",
"deliveryPoints": "Delivery Points",
"city": "City",
"postalCode": "Postal Code",
"country": "Country",
"URL": "URL",
"role": "Role",
"hoursOfService": "Hours of Service",
"electronicMailAddress": "Email Address",
"subject": "Subject",
"type": "Type",
"creator": "Creator",
"defaultPropName": "Property=\"{propName}\"",
"toolLayerMetadataTooltip": "Show the selected layer's metadata",
"layerMetadataPanelTitle": "Layer metadata",
"notification": {
"warnigGetMetadataRecordById": "Error in metadata search"
}
},
"itemTitles": {
"pointsOfContact": "Contact",
"default": "Item"
},
"emptyMetadata": "No metadata available"
},
"thematic": {
"classification_field": "Classification Field:",
Expand Down Expand Up @@ -572,18 +601,22 @@
"identifyRevGeocodeSubmitText": "More Info",
"identifyRevGeocodeCloseText": "Close",
"identifyRevGeocodeError": "Unable to geocode",
"identifyEdit": "Edit",
"getFeatureInfoError": {
"title": "Ooops! Something's wrong",
"text": "An error has occurred during this <b>GetFeatureInfo</b> request"
},
"noFeatureInfo": "There is no information available for the point you clicked",
"noFeatureInfo": "There is no information available for this point",
"noInfoForLayers": "There are no features for the following layers: ",
"history":{
"barLabel": "Map history",
"undoBtnTooltip": "Go back",
"redoBtnTooltip": "Go forward"
},
"infoFormatLbl": "Identify response format",
"infoTriggerLabel": "Trigger event for Identify",
"click": "Click",
"hover": "Hover",
"measureSupport": {
"continueLine": "Click to continue drawing the line",
"continuePolygon": "Click to continue drawing the polygon",
Expand All @@ -594,6 +627,7 @@
"MeasureLength": "Measure Distance",
"MeasureArea": "Measure Area",
"MeasureBearing": "Measure Bearing",
"MeasureTrueBearing": "Measure True Bearing",
"tooltip": "Measure length and area",
"title": "Measure",
"lengthButtonText": "Line",
Expand All @@ -602,6 +636,7 @@
"lengthLabel": "Length",
"areaLabel": "Area",
"bearingLabel": "Bearing",
"trueBearingLabel": "True Bearing",
"formula": "Formula for distance calculation",
"showLabel": "Show measurement label",
"addAsAnnotation": "Add as annotation",
Expand Down Expand Up @@ -637,6 +672,7 @@
"s_attributes": "Attributes",
"s_sort": "Sort by",
"s_max_features": "Max features",
"s_max_zoom": "Max zoom level",
"s_wfs_props_label" : "WFS service props",
"s_wfs_opt_props_label" : "Optional props",
"s_result_props_label": "Result display properties",
Expand Down Expand Up @@ -1409,7 +1445,12 @@
"default": "Search...",
"string": "Type text to filter...",
"number": "Type a number or an expression. Examples: 10, > 2, < 10",
"date": "Type a date or an expression. Use {format} for the date."
"date": "Type a date or an expression. Use {format} for the date.",
"geometry": {
"disabled": "Filter clicking on the map",
"enabled": "Click on the map to filter the results",
"applied": "Remove the filter by mouse click"
}
}
},
"toolbar": {
Expand Down Expand Up @@ -2361,6 +2402,10 @@
"description": "Allows the user to enable/disable user extensions",
"title": "User Extensions"
},
"UserSession": {
"title": "User Session",
"description": "Enables an automatically saved user session for every context"
},
"Version": {
"description": "Shows the version of MapStore in map settings tool",
"descriptionGeorchestra": "Shows the version of GeOrchestra in map settings tool",
Expand Down Expand Up @@ -2680,7 +2725,9 @@
"titleContext": "User session removing failed",
"defaultMessage": "Unknown error"
},
"successRemoved": "User session removed"
"successRemoved": "User session removed",
"remove": "Reset User Session",
"confirmRemove": "Are you sure you want to restore the default configuration?"
}
}
}
Loading

0 comments on commit ae50366

Please sign in to comment.