From 29e52f028cae17c2918fd3f5c691bce26090e969 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 3 Aug 2011 15:54:19 +0000 Subject: [PATCH] Move Commons GIS to Connect git-svn-id: https://svn.argeo.org/commons/trunk@4681 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../.classpath | 7 - .../org.argeo.gis.ui.rap.openlayers/.project | 28 -- .../.settings/org.eclipse.jdt.core.prefs | 8 - .../META-INF/MANIFEST.MF | 36 --- .../META-INF/spring/openlayers.xml | 13 - .../META-INF/spring/osgi.xml | 13 - .../build.properties | 5 - .../org.argeo.gis.ui.rap.openlayers/pom.xml | 54 ---- .../rap/openlayers/GisOpenlayersPlugin.java | 50 ---- .../openlayers/IdentifiedVectorFeature.java | 16 -- .../OpenLayersMapControlCreator.java | 22 -- .../rap/openlayers/OpenLayersMapViewer.java | 262 ------------------ .../ui/rap/openlayers/custom/BingLayer.java | 16 -- .../ui/rap/openlayers/custom/GoogleLayer.java | 12 - .../gis/ui/rap/openlayers/custom/JSON.java | 12 - 15 files changed, 554 deletions(-) delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/.project delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/MANIFEST.MF delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/osgi.xml delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/pom.xml delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/GisOpenlayersPlugin.java delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/IdentifiedVectorFeature.java delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapViewer.java delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/BingLayer.java delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/GoogleLayer.java delete mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/JSON.java diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath deleted file mode 100644 index 92f19d2ff..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/.project b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.project deleted file mode 100644 index 2c1bde033..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.gis.ui.rap.openlayers - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f6067d79d..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Sat Feb 26 14:16:37 CET 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/MANIFEST.MF b/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/MANIFEST.MF deleted file mode 100644 index 899380198..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/MANIFEST.MF +++ /dev/null @@ -1,36 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Rap -Bundle-SymbolicName: org.argeo.gis.ui.rap.openlayers;singleton:=true -Bundle-Version: 0.3.4.SNAPSHOT -Bundle-Activator: org.argeo.gis.ui.rap.openlayers.GisOpenlayersPlugin -Bundle-Vendor: Argeo -Require-Bundle: org.eclipse.rap.ui, - org.eclipse.core.runtime, - org.polymap.openlayers.rap.widget;bundle-version="[1.0.0,2.0.0)" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ActivationPolicy: lazy -Import-Package: com.vividsolutions.jts.geom;version="1.10.0", - javax.jcr;version="2.0.0", - org.apache.commons.logging;version="1.1.1", - org.argeo.eclipse.spring, - org.argeo.geotools, - org.argeo.geotools.jcr, - org.argeo.gis.ui, - org.argeo.gis.ui.editors, - org.geotools.data, - org.geotools.feature, - org.geotools.geometry.jts, - org.geotools.map, - org.geotools.map.event, - org.geotools.styling, - org.opengis.feature, - org.opengis.feature.simple, - org.opengis.feature.type, - org.opengis.filter, - org.opengis.filter.identity, - org.polymap.openlayers.rap.widget, - org.polymap.openlayers.rap.widget.base, - org.polymap.openlayers.rap.widget.base_types, - org.polymap.openlayers.rap.widget.controls, - org.polymap.openlayers.rap.widget.layers diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml b/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml deleted file mode 100644 index a9d684265..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/osgi.xml b/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/osgi.xml deleted file mode 100644 index 7a4ec53ed..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/osgi.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties b/gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties deleted file mode 100644 index 19bfacc5f..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/main/java/ -output.. = target/classes/ -bin.includes = META-INF/,\ - .,\ - js_lib/ diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/pom.xml b/gis/plugins/org.argeo.gis.ui.rap.openlayers/pom.xml deleted file mode 100644 index 2f06acaf5..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - 4.0.0 - - org.argeo.commons.gis - 0.3.4-SNAPSHOT - plugins - .. - - org.argeo.gis.ui.rap.openlayers - Commons GIS RAP OpenLayers - jar - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - - - - - org.argeo.commons.basic - org.argeo.basic.nodeps - 0.3.4-SNAPSHOT - - - org.argeo.commons.gis - org.argeo.gis.ui - 0.3.4-SNAPSHOT - - - - - org.argeo.dep.osgi - org.polymap.openlayers.rap.widget - - - - - org.argeo.commons.eclipse - org.argeo.eclipse.dep.rap - 0.3.4-SNAPSHOT - - - diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/GisOpenlayersPlugin.java b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/GisOpenlayersPlugin.java deleted file mode 100644 index 6ae728402..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/GisOpenlayersPlugin.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.argeo.gis.ui.rap.openlayers; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class GisOpenlayersPlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.argeo.gis.ui.rap.openlayers"; //$NON-NLS-1$ - - // The shared instance - private static GisOpenlayersPlugin plugin; - - /** - * The constructor - */ - public GisOpenlayersPlugin() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static GisOpenlayersPlugin getDefault() { - return plugin; - } - -} diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/IdentifiedVectorFeature.java b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/IdentifiedVectorFeature.java deleted file mode 100644 index 3c201e938..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/IdentifiedVectorFeature.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.argeo.gis.ui.rap.openlayers; - -import org.polymap.openlayers.rap.widget.features.Feature; -import org.polymap.openlayers.rap.widget.geometry.Geometry; - -public class IdentifiedVectorFeature extends Feature { - - public IdentifiedVectorFeature(Geometry point, String id) { - _create(point.getJSObjRef(), id); - } - - private void _create(String js_name, String attrs) { - super.create("new OpenLayers.Feature.Vector(" + js_name + "," + attrs - + " );"); - } -} diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java deleted file mode 100644 index 1610110e6..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.argeo.gis.ui.rap.openlayers; - -import javax.jcr.Node; - -import org.argeo.geotools.jcr.GeoJcrMapper; -import org.argeo.gis.ui.MapControlCreator; -import org.argeo.gis.ui.MapViewer; -import org.eclipse.swt.widgets.Composite; - -public class OpenLayersMapControlCreator implements MapControlCreator { - private GeoJcrMapper geoJcrMapper; - - public MapViewer createMapControl(Node context,Composite parent) { - return new OpenLayersMapViewer(context,geoJcrMapper,parent); - } - - public void setGeoJcrMapper(GeoJcrMapper geoJcrMapper) { - this.geoJcrMapper = geoJcrMapper; - } - - -} diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapViewer.java b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapViewer.java deleted file mode 100644 index d19d48040..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapViewer.java +++ /dev/null @@ -1,262 +0,0 @@ -package org.argeo.gis.ui.rap.openlayers; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; - -import javax.jcr.Node; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.geotools.GeoToolsUtils; -import org.argeo.geotools.jcr.GeoJcrMapper; -import org.argeo.gis.ui.AbstractMapViewer; -import org.argeo.gis.ui.MapViewerListener; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.geotools.data.FeatureSource; -import org.geotools.feature.FeatureCollection; -import org.geotools.feature.FeatureIterator; -import org.geotools.geometry.jts.ReferencedEnvelope; -import org.opengis.feature.simple.SimpleFeature; -import org.opengis.feature.simple.SimpleFeatureType; -import org.polymap.openlayers.rap.widget.OpenLayersWidget; -import org.polymap.openlayers.rap.widget.base.OpenLayersEventListener; -import org.polymap.openlayers.rap.widget.base.OpenLayersObject; -import org.polymap.openlayers.rap.widget.base_types.OpenLayersMap; -import org.polymap.openlayers.rap.widget.base_types.Projection; -import org.polymap.openlayers.rap.widget.controls.KeyboardDefaultsControl; -import org.polymap.openlayers.rap.widget.controls.LayerSwitcherControl; -import org.polymap.openlayers.rap.widget.controls.NavigationControl; -import org.polymap.openlayers.rap.widget.controls.OverviewMapControl; -import org.polymap.openlayers.rap.widget.controls.PanZoomBarControl; -import org.polymap.openlayers.rap.widget.controls.ScaleControl; -import org.polymap.openlayers.rap.widget.controls.SelectFeatureControl; -import org.polymap.openlayers.rap.widget.features.VectorFeature; -import org.polymap.openlayers.rap.widget.geometry.LineStringGeometry; -import org.polymap.openlayers.rap.widget.geometry.PointGeometry; -import org.polymap.openlayers.rap.widget.layers.OSMLayer; -import org.polymap.openlayers.rap.widget.layers.VectorLayer; - -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.Geometry; -import com.vividsolutions.jts.geom.MultiPolygon; -import com.vividsolutions.jts.geom.Point; - -public class OpenLayersMapViewer extends AbstractMapViewer implements - OpenLayersEventListener { - private final static Log log = LogFactory.getLog(OpenLayersMapViewer.class); - - private final OpenLayersMap map; - - private Map vectorLayers = Collections - .synchronizedMap(new HashMap()); - private Map> featureSources = Collections - .synchronizedMap(new HashMap>()); - - public OpenLayersMapViewer(Node context, GeoJcrMapper geoJcrMapper, - Composite parent) { - super(context, geoJcrMapper); - createControl(parent); - - this.map = ((OpenLayersWidget) getControl()).getMap(); - // TODO: make dependent of the base layer - map.zoomTo(2); - - // mapContextProvider.getMapContext().addMapLayerListListener(this); - - HashMap payloadMap = new HashMap(); - payloadMap.put("layername", "event.layer.name"); - this.map.events.register(this, "changebaselayer", payloadMap); - payloadMap.put("property", "event.property"); - payloadMap.put("visibility", "event.layer.visibility"); - this.map.events.register(this, "changelayer", payloadMap); - - // WARNING: registering click events on the map hides other events!! - // HashMap mapPayload = new HashMap(); - // mapPayload.put("bbox", map.getJSObjRef() + ".getExtent().toBBOX()"); - // mapPayload.put("lonlat", map.getJSObjRef() - // + ".getLonLatFromViewPortPx(event.xy)"); - // mapPayload.put("x", "event.xy.x"); - // mapPayload.put("y", "event.xy.y"); - // mapPayload.put("button", "event.button"); - // map.events.register(this, "click", mapPayload); - } - - protected void createControl(Composite parent) { - OpenLayersWidget openLayersWidget = new OpenLayersWidget(parent, - SWT.MULTI | SWT.WRAP); - openLayersWidget.setLayoutData(new GridData(GridData.FILL_BOTH)); - - OpenLayersMap map = openLayersWidget.getMap(); - map.setProjection(new Projection("EPSG:900913")); - map.setDisplayProjection(new Projection("EPSG:4326")); - map.setUnits("m"); - - map.addControl(new LayerSwitcherControl()); - NavigationControl navigationControl = new NavigationControl(); - navigationControl.setObjAttr("handleRightClicks", true); - navigationControl.setObjAttr("zoomBoxEnabled", true); - map.addControl(navigationControl); - map.addControl(new KeyboardDefaultsControl()); - map.addControl(new PanZoomBarControl()); - map.addControl(new ScaleControl()); - - // WMSLayer baseLayer = new WMSLayer("argeo_dev", - // "https://dev.argeo.org/geoserver/wms?", - // "naturalearth:10m_admin_0_countries"); - - OSMLayer osmLayer = new OSMLayer("OSM", - "http://tile.openstreetmap.org/${z}/${x}/${y}.png", 19); - map.addLayer(osmLayer); - - map.addControl(new OverviewMapControl()); - - setControl(openLayersWidget); - } - - /* - * OPENLAYERS MAP - */ - - public void process_event(OpenLayersObject source, String eventName, - HashMap payload) { - if (eventName.equals("beforefeatureadded")) { - if (log.isDebugEnabled()) - log.debug("before feature added on layer '" - + payload.get("layername") + "' x=" + payload.get("x") - + "' y=" + payload.get("y")); - } else if (eventName.equals("afterfeatureadded")) { - if (log.isDebugEnabled()) - log.debug("after feature added on layer '" - + payload.get("layername") + "' x=" + payload.get("x") - + "' y=" + payload.get("y")); - } else if (eventName.equals("featureselected")) { - if (log.isDebugEnabled()) - log.debug("feature selected " + payload); - String layerId = payload.get("layerId"); - String featureId = payload.get("featureId"); - if (!getSelected().containsKey(layerId)) - getSelected().put(layerId, new TreeSet()); - getSelected().get(layerId).add(featureId); - - for (MapViewerListener listener : getListeners()) - listener.featureSelected(layerId, featureId); - } else if (eventName.equals("featureunselected")) { - if (log.isDebugEnabled()) - log.debug("feature unselected " + payload); - String layerId = payload.get("layerId"); - String featureId = payload.get("featureId"); - if (getSelected().containsKey(layerId)) - getSelected().get(layerId).remove(featureId); - for (MapViewerListener listener : getListeners()) - listener.featureUnselected(layerId, featureId); - - } else if (log.isDebugEnabled()) - log.debug("Unknown event '" + eventName + "' from " - + source.getClass().getName() + " (" + source.getJSObjRef() - + ")" + " : " + payload); - - } - - @Override - protected void addFeatureSource(String layerId, - FeatureSource featureSource, Object style) { - FeatureIterator featureIterator = null; - try { - VectorLayer vectorLayer = new VectorLayer(featureSource.getName() - .toString()); - vectorLayer.setObjAttr("id", layerId); - vectorLayers.put(layerId, vectorLayer); - featureSources.put(layerId, featureSource); - - // selection - HashMap selectPayload = new HashMap(); - selectPayload.put("featureId", "event.feature.id"); - selectPayload.put("geometry", "event.feature.geometry"); - selectPayload.put("layerId", "event.feature.layer.id"); - vectorLayer.events.register(this, "featureselected", selectPayload); - - HashMap unselectPayload = new HashMap(); - unselectPayload.put("featureId", "event.feature.id"); - unselectPayload.put("geometry", "event.feature.geometry"); - unselectPayload.put("layerId", "event.feature.layer.id"); - vectorLayer.events.register(this, "featureunselected", - unselectPayload); - SelectFeatureControl mfc = new SelectFeatureControl(vectorLayer, 0); - // mfc.events.register(this, SelectFeatureControl.EVENT_HIGHLIGHTED, - // unselectPayload); - // mfc.events.register(this, - // SelectFeatureControl.EVENT_UNHIGHLIGHTED, - // unselectPayload); - map.addControl(mfc); - mfc.setMultiple(true); - mfc.setRenderIntent("temporary"); - mfc.activate(); - - FeatureCollection featureCollection = featureSource - .getFeatures(); - featureIterator = featureCollection.features(); - // TODO make this interruptible since it can easily block with huge - // data - while (featureIterator.hasNext()) { - SimpleFeature feature = featureIterator.next(); - Geometry geom = (Geometry) feature.getDefaultGeometry(); - if (log.isTraceEnabled()) - log.trace("Feature " + feature.getID() + ", " - + geom.getClass().getName()); - // log.debug(" Geom: " + geom.getClass() + ", centroid=" - // + geom.getCentroid()); - if (geom instanceof Point) { - Point mp = (Point) geom; - PointGeometry pg = new PointGeometry(mp.getX(), mp.getY()); - VectorFeature vf = new VectorFeature(pg); - vf.setObjAttr("id", feature.getID()); - vectorLayer.addFeatures(vf); - } else if (geom instanceof MultiPolygon) { - MultiPolygon mp = (MultiPolygon) geom; - List points = new ArrayList(); - for (Coordinate coo : mp.getCoordinates()) { - // if (log.isDebugEnabled()) - // log.debug(" " + coo.x + "," + coo.y); - points.add(new PointGeometry(coo.x, coo.y)); - } - VectorFeature vf = new VectorFeature( - new LineStringGeometry( - points.toArray(new PointGeometry[points - .size()]))); - vectorLayer.addFeatures(vf); - } - } - map.addLayer(vectorLayer); - } catch (IOException e) { - log.error("Cannot add layer " + featureSource.getName(), e); - } finally { - GeoToolsUtils.closeQuietly(featureIterator); - } - - } - - public void addLayer(String layerId, Collection collection, Object style) { - // TODO Auto-generated method stub - - } - - public void setAreaOfInterest(ReferencedEnvelope areaOfInterest) { - // TODO Auto-generated method stub - - } - - public void setStyle(String layerId, Object style) { - // TODO Auto-generated method stub - - } - - -} diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/BingLayer.java b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/BingLayer.java deleted file mode 100644 index 29c4e30fb..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/BingLayer.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.argeo.gis.ui.rap.openlayers.custom; - -import org.polymap.openlayers.rap.widget.layers.Layer; - -public class BingLayer extends Layer { - public final static String ROAD = "Road"; - public final static String AERIAL = "Aerial"; - public final static String AERIAL_WITH_LABEL = "AerialWithLabels"; - - public BingLayer(String name, String apiKey, String type) { - super.setName(name); - super.create("new OpenLayers.Layer.Bing({name:'" + name + "', key:'" - + apiKey + "' ,type:'" + type + "'})"); - - } -} diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/GoogleLayer.java b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/GoogleLayer.java deleted file mode 100644 index e78bd5184..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/GoogleLayer.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.argeo.gis.ui.rap.openlayers.custom; - -import org.polymap.openlayers.rap.widget.layers.Layer; - -public class GoogleLayer extends Layer { - public GoogleLayer(String name) { - super.setName(name); - super.create("new OpenLayers.Layer.Google( '" + name - + "',{'sphericalMercator': true, numZoomLevels: 20})"); - - } -} diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/JSON.java b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/JSON.java deleted file mode 100644 index c4b38d7b7..000000000 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/JSON.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.argeo.gis.ui.rap.openlayers.custom; - -import org.polymap.openlayers.rap.widget.base.OpenLayersObject; - -public class JSON extends OpenLayersObject { - - public JSON() { - super.create("new OpenLayers.Format.JSON();"); - setObjAttr("pretty", true); - } - -} -- 2.39.2