]> git.argeo.org Git - lgpl/argeo-commons.git/commitdiff
Move Commons GIS to Connect
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 3 Aug 2011 15:54:19 +0000 (15:54 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 3 Aug 2011 15:54:19 +0000 (15:54 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@4681 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

15 files changed:
gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/.project [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/MANIFEST.MF [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/osgi.xml [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/pom.xml [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/GisOpenlayersPlugin.java [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/IdentifiedVectorFeature.java [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapViewer.java [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/BingLayer.java [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/GoogleLayer.java [deleted file]
gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/custom/JSON.java [deleted file]

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 (file)
index 92f19d2..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
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 (file)
index 2c1bde0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.gis.ui.rap.openlayers</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
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 (file)
index f6067d7..0000000
+++ /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 (file)
index 8993801..0000000
+++ /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 (file)
index a9d6842..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="
-               http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-       <bean id="mapControlCreator"
-               class="org.argeo.gis.ui.rap.openlayers.OpenLayersMapControlCreator">
-               <property name="geoJcrMapper" ref="geoJcrMapper" />
-       </bean>
-
-</beans>
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 (file)
index 7a4ec53..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
-       http://www.springframework.org/schema/beans   \r
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <reference id="geoJcrMapper" interface="org.argeo.geotools.jcr.GeoJcrMapper" />\r
-\r
-       <service ref="mapControlCreator" interface="org.argeo.gis.ui.MapControlCreator" />\r
-\r
-</beans:beans>
\ 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 (file)
index 19bfacc..0000000
+++ /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 (file)
index 2f06aca..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons.gis</groupId>
-               <version>0.3.4-SNAPSHOT</version>
-               <artifactId>plugins</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.gis.ui.rap.openlayers</artifactId>
-       <name>Commons GIS RAP OpenLayers</name>
-       <packaging>jar</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- Commons -->
-               <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
-                       <artifactId>org.argeo.basic.nodeps</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.gis</groupId>
-                       <artifactId>org.argeo.gis.ui</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- OpenLayers RAP widget -->
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.polymap.openlayers.rap.widget</artifactId>
-               </dependency>
-
-               <!-- RCP only dependency, needed at compile time -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
-</project>
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 (file)
index 6ae7284..0000000
+++ /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 (file)
index 3c201e9..0000000
+++ /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 (file)
index 1610110..0000000
+++ /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 (file)
index d19d480..0000000
+++ /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<String, VectorLayer> vectorLayers = Collections
-                       .synchronizedMap(new HashMap<String, VectorLayer>());
-       private Map<String, FeatureSource<SimpleFeatureType, SimpleFeature>> featureSources = Collections
-                       .synchronizedMap(new HashMap<String, FeatureSource<SimpleFeatureType, SimpleFeature>>());
-
-       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<String, String> payloadMap = new HashMap<String, String>();
-               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<String, String> mapPayload = new HashMap<String, String>();
-               // 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<String, String> 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<String>());
-                       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<SimpleFeatureType, SimpleFeature> featureSource, Object style) {
-               FeatureIterator<SimpleFeature> featureIterator = null;
-               try {
-                       VectorLayer vectorLayer = new VectorLayer(featureSource.getName()
-                                       .toString());
-                       vectorLayer.setObjAttr("id", layerId);
-                       vectorLayers.put(layerId, vectorLayer);
-                       featureSources.put(layerId, featureSource);
-
-                       // selection
-                       HashMap<String, String> selectPayload = new HashMap<String, String>();
-                       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<String, String> unselectPayload = new HashMap<String, String>();
-                       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<SimpleFeatureType, SimpleFeature> 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<PointGeometry> points = new ArrayList<PointGeometry>();
-                                       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 (file)
index 29c4e30..0000000
+++ /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 (file)
index e78bd51..0000000
+++ /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 (file)
index c4b38d7..0000000
+++ /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);
-       }
-
-}