diff --git a/.liquibase/Data_alias/basic/2021.0.0/Address/addLatLonIndizes.xml b/.liquibase/Data_alias/basic/2021.0.0/Address/addLatLonIndizes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..89673dc39093067eeb6a8b62ae0771f92622f68a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.0/Address/addLatLonIndizes.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.goderbauer" id="401ad958-abfd-4002-a2fe-f803e0e72d6c">
+ <createIndex indexName="IDX_ADDRESS_LAT" tableName="ADDRESS">
+ <column name="LAT"/>
+ </createIndex>
+ <createIndex indexName="IDX_ADDRESS_LON" tableName="ADDRESS">
+ <column name="LON"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.0/changelog.xml b/.liquibase/Data_alias/basic/2021.0.0/changelog.xml
index a434fc4632a23c6049a7d7f0dd92cec137ac1f8e..c698b278b7ac94cc32aaafb362d2c9895d4f384f 100644
--- a/.liquibase/Data_alias/basic/2021.0.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.0/changelog.xml
@@ -4,4 +4,5 @@
<include relativeToChangelogFile="true" file="Classification/changelog.xml"/>
<include relativeToChangelogFile="true" file="Visit/changelog.xml"/>
<include relativeToChangelogFile="true" file="UpdateAddrFormats.xml"/>
+ <include relativeToChangelogFile="true" file="Address/addLatLonIndizes.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 12d0865aebe1c4bc81cb8563000a34e896ec8998..e49dccc3c73aae94950bf4bf11553c95fe43a3ad 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -23,4 +23,4 @@
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
<!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/entity/AdminViewRow_entity/AdminViewRow_entity.aod b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
index e957f3e131e1570cc6fd74e143d74bfe0caec1d6..5f87fe3406299280daa73f237b6d134c692c6775 100644
--- a/entity/AdminViewRow_entity/AdminViewRow_entity.aod
+++ b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
@@ -3,6 +3,7 @@
<name>AdminViewRow_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AdminViewRow_entity/documentation.adoc</documentation>
+ <metadata>%aditoprj%/entity/AdminViewRow_entity/metadata.js</metadata>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/AdminViewRow_entity/metadata.js b/entity/AdminViewRow_entity/metadata.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/AroundLocation_entity/AroundLocation_entity.aod b/entity/AroundLocation_entity/AroundLocation_entity.aod
index 227c9fc268c1ccecd8d7dfe22781522a0f6a2c2b..ae50af9dc481eebf87ee12d0eb927e1ce42cdbd5 100644
--- a/entity/AroundLocation_entity/AroundLocation_entity.aod
+++ b/entity/AroundLocation_entity/AroundLocation_entity.aod
@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AroundLocation_entity/documentation.adoc</documentation>
<onValidation>%aditoprj%/entity/AroundLocation_entity/onValidation.js</onValidation>
+ <iconId>VAADIN:MAP_MARKER</iconId>
<recordContainer>dataless</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/AroundLocation_entity/entityfields/open/onActionProcess.js b/entity/AroundLocation_entity/entityfields/open/onActionProcess.js
index 064f8348f4474ef01e4dfb061e6abdfff8ba6427..7f56d76e8d993a8a3237a324901b8bb8a59f5046 100644
--- a/entity/AroundLocation_entity/entityfields/open/onActionProcess.js
+++ b/entity/AroundLocation_entity/entityfields/open/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Context_lib");
import("system.vars");
import("system.neon");
@@ -6,5 +7,33 @@ var contactIds = vars.get("$field.ContactIds");
if (contactIds)
contactIds = JSON.parse(contactIds);
-neon.openContext("Organisation", "OrganisationFilter_view", contactIds, neon.OPERATINGSTATE_SEARCH, null, null);
-//neon.openContext("Organisation", null, contactIds, null, null, null);
\ No newline at end of file
+
+var homeFeatureCollection = {
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "type": "Feature",
+ "properties": {
+ "ADITO-radius": vars.get("$field.SearchRadius") * 1000,
+ "ADITO-color": neon.PRIORITY_HIGH_COLOR,
+ "ADITO-icon": "VAADIN:MAP_MARKER",
+ "ADITO-targetContext": "Organisation",
+ "ADITO-targetId": vars.get("$param.OriginUid_param"),
+ "ADITO-label": ContextUtils.loadContentTitle("Organisation_entity", vars.get("$param.OriginUid_param"))
+ },
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ parseFloat(vars.get("$param.LocationLon_param"), 10),
+ parseFloat(vars.get("$param.LocationLat_param"), 10)
+
+ ]
+ }
+ }
+ ]
+};
+
+var params = {
+ MapViewAdditionalFeatures_param: JSON.stringify(homeFeatureCollection)
+};
+neon.openContext("Organisation", "OrganisationFilter_view", contactIds, neon.OPERATINGSTATE_SEARCH, params, null);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 1b0fc5e0a6f097b1be2e4a280b6ce2023712a06a..8d4046039690f465f2b4ab576b36afe705b8781a 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -144,6 +144,10 @@
<name>DuplicateCurrentContactId_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>MapViewAdditionalFeatures_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
<dependencies>
<entityDependency>
@@ -623,6 +627,10 @@
<name>DuplicateCurrentContactId_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>MapViewAdditionalFeatures_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
<dependencies>
<entityDependency>
@@ -688,6 +696,10 @@
<name>DuplicateCurrentContactId_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>MapViewAdditionalFeatures_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
<dependencies>
<entityDependency>
@@ -1035,6 +1047,10 @@
<name>ExcludeOrganisationsByPersonId</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>MapViewAdditionalFeatures_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityParameter>
@@ -1254,6 +1270,10 @@
<name>WithPrivate_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>MapViewAdditionalFeatures_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
<dependencies>
<entityDependency>
@@ -1319,6 +1339,10 @@
<name>OrganisationType_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>MapViewAdditionalFeatures_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -1363,6 +1387,10 @@
<name>OnlyOwnSupervised_param</name>
<expose v="false" />
</entityParameter>
+ <entityParameter>
+ <name>MapViewAdditionalFeatures_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
<dependencies>
<entityDependency>
@@ -1445,6 +1473,19 @@
<name>OnlyActive_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>MAP_CONFIG</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/map_config/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>MAP_FEATURE_COLLECTION</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/map_feature_collection/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>MapViewAdditionalFeatures_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/mapviewadditionalfeatures_param/documentation.adoc</documentation>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/map_config/valueProcess.js b/entity/Organisation_entity/entityfields/map_config/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6421bc7b36e025ad60e937e7d1173bbadbadc282
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/map_config/valueProcess.js
@@ -0,0 +1,26 @@
+import("system.util");
+import("system.fileIO");
+import("system.result");
+
+var config = {
+ startingCenterPosition : {
+ lat: 0,
+ lon: 0,
+ zoomLevel: 0,
+ autoLocate: true
+ },
+ boundaries: {
+ minZoom: 0,
+ maxZoom: 20
+ },
+ tiles: [
+ {
+ title: "Open Street Map",
+ url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+ attribution: "Map data © <a href=\"https://openstreetmap.org\">OpenStreetMap</a> contributors"
+ }
+ ]
+};
+
+var res = JSON.stringify(config);
+result.string(res);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/map_feature_collection/valueProcess.js b/entity/Organisation_entity/entityfields/map_feature_collection/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..609c09148d65619d0ba26d0d72146dea6c533c80
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/map_feature_collection/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var additionalMapFeatures = vars.get("$param.MapViewAdditionalFeatures_param");
+
+if (additionalMapFeatures)//additionalMapFeatures is already a stringified object
+ result.string("[" + additionalMapFeatures + "]");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/mapviewadditionalfeatures_param/documentation.adoc b/entity/Organisation_entity/entityfields/mapviewadditionalfeatures_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..3c5296d3417e36b0efa672ea64456579876159ea
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/mapviewadditionalfeatures_param/documentation.adoc
@@ -0,0 +1 @@
+You may provide a `GeoJSON` `FeatureCollection` that will be display in the `MapViewTemplate` of the `OrganisationFilter_view` here.
\ No newline at end of file
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 352cf6a5b00464ee39750c73cf87a69e13911931..5b465757389227fa15fa405eaf965ccf5f5897d3 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -49,10 +49,10 @@
<children>
<tableViewTemplate>
<name>Organisations</name>
- <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
- <favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
<subtitleField>CUSTOMERCODE_DISPLAY_fieldGroup</subtitleField>
<entityField>#ENTITY</entityField>
+ <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
<linkedColumns>
<element>NAME</element>
</linkedColumns>
@@ -98,9 +98,9 @@
</tableViewTemplate>
<treeTableViewTemplate>
<name>Treetable</name>
+ <entityField>#ENTITY</entityField>
<favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
- <entityField>#ENTITY</entityField>
<linkedColumns>
<element>NAME</element>
</linkedColumns>
@@ -158,5 +158,15 @@
</neonDynamicMultiDataChartColumn>
</columns>
</dynamicMultiDataChartViewTemplate>
+ <mapViewTemplate>
+ <name>OrganisationMap</name>
+ <configField>MAP_CONFIG</configField>
+ <autoGeneratedMarkerLatitudeField>STANDARD_LAT</autoGeneratedMarkerLatitudeField>
+ <autoGeneratedMarkerLongitudeField>STANDARD_LON</autoGeneratedMarkerLongitudeField>
+ <autoGeneratedMarkerIconField>#ICON</autoGeneratedMarkerIconField>
+ <autoGeneratedMarkerPopupField>ADDRESS_ID</autoGeneratedMarkerPopupField>
+ <geoJsonFeatureCollectionField>MAP_FEATURE_COLLECTION</geoJsonFeatureCollectionField>
+ <maxDBRow v="400" />
+ </mapViewTemplate>
</children>
</neonView>