diff --git a/vtm-web-js/build.gradle b/vtm-web-js/build.gradle index fa4acb8c..846e2821 100644 --- a/vtm-web-js/build.gradle +++ b/vtm-web-js/build.gradle @@ -37,7 +37,6 @@ dependencies { evaluationDependsOn(':vtm') evaluationDependsOn(':vtm-themes') evaluationDependsOn(':vtm-gdx') -//evaluationDependsOn(':vtm-extras') evaluationDependsOn(':vtm-web') gwt { @@ -58,7 +57,6 @@ gwt { src += files(project(':vtm-themes').sourceSets.main.allJava.srcDirs) src += files(project(':vtm-themes').sourceSets.main.resources.srcDirs) src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs) - //src += files(project(':vtm-extras').sourceSets.main.allJava.srcDirs) src += files(project(':vtm-web').sourceSets.main.allJava.srcDirs) } diff --git a/vtm-web-js/src/org/oscim/web/js/JsOsmLanduseJsonTileSource.java b/vtm-web-js/src/org/oscim/web/js/JsOsmLanduseJsonTileSource.java new file mode 100644 index 00000000..871463e9 --- /dev/null +++ b/vtm-web-js/src/org/oscim/web/js/JsOsmLanduseJsonTileSource.java @@ -0,0 +1,11 @@ +package org.oscim.web.js; + +import org.oscim.tiling.source.geojson.OsmLanduseJsonTileSource; +import org.timepedia.exporter.client.ExportOverlay; +import org.timepedia.exporter.client.ExportPackage; + +@ExportPackage("vtm") +public class JsOsmLanduseJsonTileSource implements ExportOverlay { + public JsOsmLanduseJsonTileSource() { + } +} diff --git a/vtm-web-js/src/org/oscim/web/js/JsOverlays.java b/vtm-web-js/src/org/oscim/web/js/JsOverlays.java index dd60152d..2b647706 100644 --- a/vtm-web-js/src/org/oscim/web/js/JsOverlays.java +++ b/vtm-web-js/src/org/oscim/web/js/JsOverlays.java @@ -13,12 +13,15 @@ import org.oscim.map.Map; import org.oscim.renderer.LayerRenderer; import org.oscim.theme.IRenderTheme; import org.oscim.tiling.TileSource; +import org.oscim.tiling.source.geojson.HighroadJsonTileSource; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.timepedia.exporter.client.Export; import org.timepedia.exporter.client.ExportOverlay; import org.timepedia.exporter.client.ExportPackage; +import org.timepedia.exporter.client.Exportable; -public final class JsOverlays { +@ExportPackage("") +public class JsOverlays implements Exportable { @ExportPackage("vtm") @Export("Layers") public interface XLayers extends ExportOverlay { @@ -66,20 +69,6 @@ public final class JsOverlays { } } - @ExportPackage("vtm") - @Export("VectorTileLayer") - public static class XVectorTileLayer implements ExportOverlay { - public XVectorTileLayer(Map map, TileSource tileSource) { - } - - public boolean setTileSource(TileSource tileSource) { - return false; - } - - public void setRenderTheme(IRenderTheme theme) { - } - } - @ExportPackage("vtm") @Export("OsmTileLayer") public static class XOsmTileLayer implements ExportOverlay { @@ -94,21 +83,13 @@ public final class JsOverlays { } } - // @ExportPackage("vtm") - // @Export("OsmLanduseJsonTileSource") - // public static class XOsmLanduseJsonTileSource implements - // ExportOverlay { - // public XOsmLanduseJsonTileSource() { - // } - // } - // - // @ExportPackage("vtm") - // @Export("HighroadJsonTileSource") - // public static class XHighroadJsonTileSource implements - // ExportOverlay { - // public XHighroadJsonTileSource() { - // } - // } + @ExportPackage("vtm") + @Export("HighroadJsonTileSource") + public static class XHighroadJsonTileSource implements + ExportOverlay { + public XHighroadJsonTileSource() { + } + } @ExportPackage("vtm") @Export("OSciMap4TileSource") diff --git a/vtm-web-js/src/org/oscim/web/js/JsVectorTileLayer.java b/vtm-web-js/src/org/oscim/web/js/JsVectorTileLayer.java new file mode 100644 index 00000000..7b569d7b --- /dev/null +++ b/vtm-web-js/src/org/oscim/web/js/JsVectorTileLayer.java @@ -0,0 +1,21 @@ +package org.oscim.web.js; + +import org.oscim.layers.tile.vector.VectorTileLayer; +import org.oscim.map.Map; +import org.oscim.theme.IRenderTheme; +import org.oscim.tiling.TileSource; +import org.timepedia.exporter.client.ExportOverlay; +import org.timepedia.exporter.client.ExportPackage; + +@ExportPackage("vtm") +public class JsVectorTileLayer implements ExportOverlay { + public JsVectorTileLayer(Map map, TileSource tileSource) { + } + + public boolean setTileSource(TileSource tileSource) { + return false; + } + + public void setRenderTheme(IRenderTheme theme) { + } +} diff --git a/vtm-web-js/war/map.js b/vtm-web-js/war/map.js index 3ab59c54..32ec8906 100644 --- a/vtm-web-js/war/map.js +++ b/vtm-web-js/war/map.js @@ -20,11 +20,11 @@ function createLayers() { // map.addLayer(new vtm.BuildingLayer(m, l)) // map.addLayer(new vtm.LabelLayer(m, l)) - // t = map.loadTheme("TRONRENDER") - // ts = new vtm.OsmLanduseJsonTileSource() - // l = new vtm.VectorTileLayer(m, ts) - // l.setRenderTheme(t) - // map.addLayer(l) + t = map.loadTheme("TRONRENDER") + ts = new vtm.OsmLanduseJsonTileSource() + l = new vtm.VectorTileLayer(m, ts) + l.setRenderTheme(t) + map.addLayer(l) } function canvasResize() {