X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=environment%2Forg.argeo.geo.ui%2Fsrc%2Forg%2Fargeo%2Fsupport%2Fopenlayers%2FOverviewMap.java;h=b2fd01ed0839967a80713ad3cc43e9f11c504e61;hb=aed0041dc225ccd19d97229ca656e17b6c9c47d4;hp=33e888f7e5d740d4e253ce2d423de2006c8f04a1;hpb=321efa1b363a1cd5f9fd714cd4945778fa55c0e9;p=gpl%2Fargeo-suite.git diff --git a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java index 33e888f..b2fd01e 100644 --- a/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java +++ b/environment/org.argeo.geo.ui/src/org/argeo/support/openlayers/OverviewMap.java @@ -9,10 +9,7 @@ import javax.jcr.observation.EventIterator; import javax.jcr.observation.EventListener; import javax.jcr.query.Query; -import org.argeo.api.NodeConstants; -import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.entity.EntityType; import org.argeo.jcr.JcrException; @@ -45,8 +42,8 @@ public class OverviewMap implements CmsUiProvider { } }); } - }, Event.PROPERTY_CHANGED | Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_ADDED, - "/", true, null, nodeTypes, false); + }, Event.PROPERTY_CHANGED | Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_ADDED, "/", true, null, + nodeTypes, false); } catch (RepositoryException e) { throw new IllegalStateException("Cannot add JCR observer", e); } @@ -56,17 +53,14 @@ public class OverviewMap implements CmsUiProvider { protected void refreshUi(Composite parent, Node context) throws RepositoryException { CmsUiUtils.clear(parent); - boolean coworker = CmsView.getCmsView(parent).doAs(() -> CurrentUser.isInRole(NodeConstants.ROLE_USER_ADMIN)); Query query = context.getSession().getWorkspace().getQueryManager() - .createQuery("SELECT * FROM [" + EntityType.local.get() + "] WHERE [entity:type]='" - + EntityType.geopoint.get() + "'", - Query.JCR_SQL2); + .createQuery("SELECT * FROM [" + EntityType.geopoint.get() + "]", Query.JCR_SQL2); List geoPoints = JcrUtils.nodeIteratorToList(query.execute().getNodes()); - OpenLayersMap apafMap = new OpenLayersMap(parent, SWT.NONE, getClass().getResource("map-osm.html")); - apafMap.setLayoutData(CmsUiUtils.fillAll()); + OpenLayersMap map = new OpenLayersMap(parent, SWT.NONE, getClass().getResource("map-osm.html")); + map.setLayoutData(CmsUiUtils.fillAll()); // apafMap.setZoom(7); // apafMap.setCenter(-2.472, 8.010); - apafMap.addPoints(geoPoints); + map.addPoints(geoPoints); } }