Disable vtm-jeo module until update #375
This commit is contained in:
parent
13c42d509c
commit
ae6ce553b9
@ -39,7 +39,6 @@ def versionName() { return version }
|
||||
|
||||
subprojects {
|
||||
repositories {
|
||||
maven { url 'https://repo.boundlessgeo.com/main' }
|
||||
jcenter()
|
||||
}
|
||||
|
||||
|
@ -19,6 +19,7 @@
|
||||
- Improve canvas DPI setting [#349](https://github.com/mapsforge/vtm/issues/349)
|
||||
- OSM indoor layer enhancements [#366](https://github.com/mapsforge/vtm/issues/366)
|
||||
- Gretty plugin at web modules [#338](https://github.com/mapsforge/vtm/issues/338)
|
||||
- Disable vtm-jeo module until update [#375](https://github.com/mapsforge/vtm/issues/375)
|
||||
- Many other minor improvements and bug fixes
|
||||
- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.8.0)
|
||||
|
||||
|
@ -10,7 +10,7 @@ include ':vtm-gdx'
|
||||
include ':vtm-http'
|
||||
include ':vtm-ios'
|
||||
include ':vtm-ios-example'
|
||||
include ':vtm-jeo'
|
||||
//include ':vtm-jeo'
|
||||
include ':vtm-json'
|
||||
include ':vtm-jts'
|
||||
include ':vtm-playground'
|
||||
|
@ -41,9 +41,9 @@
|
||||
<activity
|
||||
android:name=".ClusterMarkerOverlayActivity"
|
||||
android:configChanges="keyboardHidden|orientation|screenSize" />
|
||||
<activity
|
||||
<!--<activity
|
||||
android:name=".JeoIndoorMapActivity"
|
||||
android:configChanges="keyboardHidden|orientation|screenSize" />
|
||||
android:configChanges="keyboardHidden|orientation|screenSize" />-->
|
||||
<activity
|
||||
android:name=".LayerGroupActivity"
|
||||
android:configChanges="keyboardHidden|orientation|screenSize" />
|
||||
|
@ -4,9 +4,9 @@ dependencies {
|
||||
compile project(':vtm-android')
|
||||
compile project(':vtm-extras')
|
||||
compile project(':vtm-http')
|
||||
compile(project(':vtm-jeo')) {
|
||||
/*compile(project(':vtm-jeo')) {
|
||||
exclude group: 'com.vividsolutions', module: 'jts'
|
||||
}
|
||||
}*/
|
||||
compile project(':vtm-json')
|
||||
compile project(':vtm-jts')
|
||||
compile project(':vtm-themes')
|
||||
|
@ -1,186 +1,186 @@
|
||||
/*
|
||||
* Copyright 2014 Hannes Janetzek
|
||||
* Copyright 2016-2017 devemux86
|
||||
*
|
||||
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under the
|
||||
* terms of the GNU Lesser General Public License as published by the Free Software
|
||||
* Foundation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.oscim.android.test;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
import android.widget.ToggleButton;
|
||||
|
||||
import org.jeo.map.Style;
|
||||
import org.jeo.vector.VectorDataset;
|
||||
import org.oscim.backend.canvas.Color;
|
||||
import org.oscim.layers.OSMIndoorLayer;
|
||||
import org.oscim.layers.tile.buildings.BuildingLayer;
|
||||
import org.oscim.layers.tile.vector.labeling.LabelLayer;
|
||||
import org.oscim.test.JeoTest;
|
||||
import org.oscim.theme.VtmThemes;
|
||||
import org.oscim.theme.styles.TextStyle;
|
||||
import org.oscim.utils.IOUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class JeoIndoorMapActivity extends BaseMapActivity {
|
||||
public static final Logger log = LoggerFactory.getLogger(JeoIndoorMapActivity.class);
|
||||
|
||||
// from http://overpass-turbo.eu/s/2vp
|
||||
String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
|
||||
|
||||
private OSMIndoorLayer mIndoorLayer;
|
||||
|
||||
public JeoIndoorMapActivity() {
|
||||
super(R.layout.jeo_indoor_map);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
mMap.addTask(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
showToast("load data");
|
||||
InputStream is = null;
|
||||
try {
|
||||
// File file = new File(Environment.getExternalStorageDirectory()
|
||||
// .getAbsolutePath(), "osmindoor.json");
|
||||
// is = new FileInputStream(file);
|
||||
|
||||
URL url = new URL(PATH);
|
||||
URLConnection conn = url.openConnection();
|
||||
is = conn.getInputStream();
|
||||
loadJson(is);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
IOUtils.closeQuietly(is);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
mMap.setTheme(VtmThemes.DEFAULT);
|
||||
|
||||
mMap.layers().add(new BuildingLayer(mMap, mBaseLayer));
|
||||
mMap.layers().add(new LabelLayer(mMap, mBaseLayer));
|
||||
|
||||
// String file = Environment.getExternalStorageDirectory().getAbsolutePath();
|
||||
// VectorDataset data = (VectorDataset) JeoTest.getJsonData(file + "/states.json", true);
|
||||
// Style style = JeoTest.getStyle();
|
||||
// mMap.layers().add(new JeoVectorLayer(mMap, data, style));
|
||||
}
|
||||
|
||||
void loadJson(InputStream is) {
|
||||
showToast("got data");
|
||||
|
||||
VectorDataset data = JeoTest.readGeoJson(is);
|
||||
Style style = JeoTest.getStyle();
|
||||
float scale = getResources().getDisplayMetrics().density;
|
||||
TextStyle textStyle = TextStyle.builder()
|
||||
.isCaption(true)
|
||||
.fontSize(16 * scale).color(Color.BLACK)
|
||||
.strokeWidth(2.2f * scale).strokeColor(Color.WHITE)
|
||||
.build();
|
||||
mIndoorLayer = new OSMIndoorLayer(mMap, data, style, textStyle);
|
||||
mMap.layers().add(mIndoorLayer);
|
||||
|
||||
showToast("data ready");
|
||||
mMap.updateMap(true);
|
||||
|
||||
mIndoorLayer.activeLevels[0] = true;
|
||||
shift();
|
||||
}
|
||||
|
||||
public void showToast(final String text) {
|
||||
final Context ctx = this;
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Toast toast = Toast.makeText(ctx, text, Toast.LENGTH_SHORT);
|
||||
toast.show();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
boolean mShift = true;
|
||||
|
||||
public void shift() {
|
||||
if (!mShift)
|
||||
return;
|
||||
|
||||
mMap.postDelayed(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
for (int i = 0; i < 10; i++) {
|
||||
if (mIndoorLayer.activeLevels[i]) {
|
||||
mIndoorLayer.activeLevels[i] = false;
|
||||
mIndoorLayer.activeLevels[(i + 1) % 9] = true;
|
||||
mIndoorLayer.update();
|
||||
break;
|
||||
}
|
||||
}
|
||||
shift();
|
||||
}
|
||||
}, 200);
|
||||
|
||||
}
|
||||
|
||||
public void onClick(View v) {
|
||||
mShift = false;
|
||||
|
||||
if (mIndoorLayer == null)
|
||||
return;
|
||||
|
||||
int i = 0;
|
||||
|
||||
if (v instanceof ToggleButton) {
|
||||
ToggleButton b = (ToggleButton) v;
|
||||
i = (b.getTextOn().charAt(0) - '0') + 1;
|
||||
}
|
||||
|
||||
if (i < 0 || i > 9)
|
||||
i = 0;
|
||||
|
||||
mIndoorLayer.activeLevels[i] ^= true;
|
||||
if (v instanceof ToggleButton)
|
||||
((ToggleButton) v).setChecked(mIndoorLayer.activeLevels[i]);
|
||||
log.debug(Arrays.toString(mIndoorLayer.activeLevels));
|
||||
mIndoorLayer.update();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStop() {
|
||||
super.onStop();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
|
||||
/* ignore saved position */
|
||||
//mMap.setMapPosition(49.417, 8.673, 1 << 17);
|
||||
mMap.setMapPosition(53.5620092, 9.9866457, 1 << 16);
|
||||
}
|
||||
}
|
||||
///*
|
||||
// * Copyright 2014 Hannes Janetzek
|
||||
// * Copyright 2016-2017 devemux86
|
||||
// *
|
||||
// * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
|
||||
// *
|
||||
// * This program is free software: you can redistribute it and/or modify it under the
|
||||
// * terms of the GNU Lesser General Public License as published by the Free Software
|
||||
// * Foundation, either version 3 of the License, or (at your option) any later version.
|
||||
// *
|
||||
// * This program is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
// * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
// *
|
||||
// * You should have received a copy of the GNU Lesser General Public License along with
|
||||
// * this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
// */
|
||||
//package org.oscim.android.test;
|
||||
//
|
||||
//import android.content.Context;
|
||||
//import android.os.Bundle;
|
||||
//import android.view.View;
|
||||
//import android.widget.Toast;
|
||||
//import android.widget.ToggleButton;
|
||||
//
|
||||
//import org.jeo.map.Style;
|
||||
//import org.jeo.vector.VectorDataset;
|
||||
//import org.oscim.backend.canvas.Color;
|
||||
//import org.oscim.layers.OSMIndoorLayer;
|
||||
//import org.oscim.layers.tile.buildings.BuildingLayer;
|
||||
//import org.oscim.layers.tile.vector.labeling.LabelLayer;
|
||||
//import org.oscim.test.JeoTest;
|
||||
//import org.oscim.theme.VtmThemes;
|
||||
//import org.oscim.theme.styles.TextStyle;
|
||||
//import org.oscim.utils.IOUtils;
|
||||
//import org.slf4j.Logger;
|
||||
//import org.slf4j.LoggerFactory;
|
||||
//
|
||||
//import java.io.IOException;
|
||||
//import java.io.InputStream;
|
||||
//import java.net.URL;
|
||||
//import java.net.URLConnection;
|
||||
//import java.util.Arrays;
|
||||
//
|
||||
//public class JeoIndoorMapActivity extends BaseMapActivity {
|
||||
// public static final Logger log = LoggerFactory.getLogger(JeoIndoorMapActivity.class);
|
||||
//
|
||||
// // from http://overpass-turbo.eu/s/2vp
|
||||
// String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
|
||||
//
|
||||
// private OSMIndoorLayer mIndoorLayer;
|
||||
//
|
||||
// public JeoIndoorMapActivity() {
|
||||
// super(R.layout.jeo_indoor_map);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onCreate(Bundle savedInstanceState) {
|
||||
// super.onCreate(savedInstanceState);
|
||||
//
|
||||
// mMap.addTask(new Runnable() {
|
||||
// @Override
|
||||
// public void run() {
|
||||
// showToast("load data");
|
||||
// InputStream is = null;
|
||||
// try {
|
||||
// // File file = new File(Environment.getExternalStorageDirectory()
|
||||
// // .getAbsolutePath(), "osmindoor.json");
|
||||
// // is = new FileInputStream(file);
|
||||
//
|
||||
// URL url = new URL(PATH);
|
||||
// URLConnection conn = url.openConnection();
|
||||
// is = conn.getInputStream();
|
||||
// loadJson(is);
|
||||
// } catch (IOException e) {
|
||||
// e.printStackTrace();
|
||||
// } finally {
|
||||
// IOUtils.closeQuietly(is);
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// mMap.setTheme(VtmThemes.DEFAULT);
|
||||
//
|
||||
// mMap.layers().add(new BuildingLayer(mMap, mBaseLayer));
|
||||
// mMap.layers().add(new LabelLayer(mMap, mBaseLayer));
|
||||
//
|
||||
// // String file = Environment.getExternalStorageDirectory().getAbsolutePath();
|
||||
// // VectorDataset data = (VectorDataset) JeoTest.getJsonData(file + "/states.json", true);
|
||||
// // Style style = JeoTest.getStyle();
|
||||
// // mMap.layers().add(new JeoVectorLayer(mMap, data, style));
|
||||
// }
|
||||
//
|
||||
// void loadJson(InputStream is) {
|
||||
// showToast("got data");
|
||||
//
|
||||
// VectorDataset data = JeoTest.readGeoJson(is);
|
||||
// Style style = JeoTest.getStyle();
|
||||
// float scale = getResources().getDisplayMetrics().density;
|
||||
// TextStyle textStyle = TextStyle.builder()
|
||||
// .isCaption(true)
|
||||
// .fontSize(16 * scale).color(Color.BLACK)
|
||||
// .strokeWidth(2.2f * scale).strokeColor(Color.WHITE)
|
||||
// .build();
|
||||
// mIndoorLayer = new OSMIndoorLayer(mMap, data, style, textStyle);
|
||||
// mMap.layers().add(mIndoorLayer);
|
||||
//
|
||||
// showToast("data ready");
|
||||
// mMap.updateMap(true);
|
||||
//
|
||||
// mIndoorLayer.activeLevels[0] = true;
|
||||
// shift();
|
||||
// }
|
||||
//
|
||||
// public void showToast(final String text) {
|
||||
// final Context ctx = this;
|
||||
// runOnUiThread(new Runnable() {
|
||||
// @Override
|
||||
// public void run() {
|
||||
// Toast toast = Toast.makeText(ctx, text, Toast.LENGTH_SHORT);
|
||||
// toast.show();
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// boolean mShift = true;
|
||||
//
|
||||
// public void shift() {
|
||||
// if (!mShift)
|
||||
// return;
|
||||
//
|
||||
// mMap.postDelayed(new Runnable() {
|
||||
//
|
||||
// @Override
|
||||
// public void run() {
|
||||
// for (int i = 0; i < 10; i++) {
|
||||
// if (mIndoorLayer.activeLevels[i]) {
|
||||
// mIndoorLayer.activeLevels[i] = false;
|
||||
// mIndoorLayer.activeLevels[(i + 1) % 9] = true;
|
||||
// mIndoorLayer.update();
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// shift();
|
||||
// }
|
||||
// }, 200);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// public void onClick(View v) {
|
||||
// mShift = false;
|
||||
//
|
||||
// if (mIndoorLayer == null)
|
||||
// return;
|
||||
//
|
||||
// int i = 0;
|
||||
//
|
||||
// if (v instanceof ToggleButton) {
|
||||
// ToggleButton b = (ToggleButton) v;
|
||||
// i = (b.getTextOn().charAt(0) - '0') + 1;
|
||||
// }
|
||||
//
|
||||
// if (i < 0 || i > 9)
|
||||
// i = 0;
|
||||
//
|
||||
// mIndoorLayer.activeLevels[i] ^= true;
|
||||
// if (v instanceof ToggleButton)
|
||||
// ((ToggleButton) v).setChecked(mIndoorLayer.activeLevels[i]);
|
||||
// log.debug(Arrays.toString(mIndoorLayer.activeLevels));
|
||||
// mIndoorLayer.update();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// protected void onStop() {
|
||||
// super.onStop();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// protected void onResume() {
|
||||
// super.onResume();
|
||||
//
|
||||
// /* ignore saved position */
|
||||
// //mMap.setMapPosition(49.417, 8.673, 1 << 17);
|
||||
// mMap.setMapPosition(53.5620092, 9.9866457, 1 << 16);
|
||||
// }
|
||||
//}
|
||||
|
@ -77,7 +77,7 @@ public class Samples extends Activity {
|
||||
linearLayout.addView(createButton(MapPositionActivity.class));
|
||||
linearLayout.addView(createButton(S3DBMapActivity.class));
|
||||
linearLayout.addView(createButton(ThemeStylerActivity.class));
|
||||
linearLayout.addView(createButton(JeoIndoorMapActivity.class));
|
||||
//linearLayout.addView(createButton(JeoIndoorMapActivity.class));
|
||||
}
|
||||
|
||||
private Button createButton(final Class<?> clazz) {
|
||||
|
@ -4,7 +4,7 @@ dependencies {
|
||||
compile project(':vtm-desktop')
|
||||
compile project(':vtm-extras')
|
||||
compile project(':vtm-http')
|
||||
compile project(':vtm-jeo')
|
||||
//compile project(':vtm-jeo')
|
||||
compile project(':vtm-json')
|
||||
compile project(':vtm-jts')
|
||||
compile "org.slf4j:slf4j-simple:$slf4jVersion"
|
||||
|
@ -1,93 +1,93 @@
|
||||
/*
|
||||
* Copyright 2014 Hannes Janetzek
|
||||
* Copyright 2016-2017 devemux86
|
||||
*
|
||||
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under the
|
||||
* terms of the GNU Lesser General Public License as published by the Free Software
|
||||
* Foundation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.oscim.test.jeo;
|
||||
|
||||
import org.jeo.map.Style;
|
||||
import org.jeo.vector.VectorDataset;
|
||||
import org.oscim.backend.canvas.Color;
|
||||
import org.oscim.gdx.GdxMap;
|
||||
import org.oscim.gdx.GdxMapApp;
|
||||
import org.oscim.layers.JeoVectorLayer;
|
||||
import org.oscim.layers.OSMIndoorLayer;
|
||||
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
|
||||
import org.oscim.test.JeoTest;
|
||||
import org.oscim.theme.styles.TextStyle;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
|
||||
import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
|
||||
|
||||
public class LayerTest extends GdxMap {
|
||||
|
||||
// from http://overpass-turbo.eu/s/2vp
|
||||
String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
|
||||
|
||||
private OSMIndoorLayer mIndoorLayer;
|
||||
|
||||
@Override
|
||||
public void createLayers() {
|
||||
mMap.setBaseMap(new BitmapTileLayer(mMap, STAMEN_TONER.build()));
|
||||
|
||||
mMap.addTask(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
URL url = new URL(PATH);
|
||||
URLConnection conn = url.openConnection();
|
||||
InputStream is = conn.getInputStream();
|
||||
|
||||
VectorDataset data = JeoTest.readGeoJson(is);
|
||||
Style style = JeoTest.getStyle();
|
||||
TextStyle textStyle = TextStyle.builder()
|
||||
.isCaption(true)
|
||||
.fontSize(16).color(Color.BLACK)
|
||||
.strokeWidth(2.2f).strokeColor(Color.WHITE)
|
||||
.build();
|
||||
mIndoorLayer = new OSMIndoorLayer(mMap, data, style, textStyle);
|
||||
mIndoorLayer.activeLevels[0] = true;
|
||||
mIndoorLayer.activeLevels[1] = true;
|
||||
mIndoorLayer.activeLevels[2] = true;
|
||||
mIndoorLayer.activeLevels[3] = true;
|
||||
|
||||
mMap.layers().add(new JeoVectorLayer(mMap, data, style));
|
||||
mMap.layers().add(mIndoorLayer);
|
||||
|
||||
mMap.updateMap(true);
|
||||
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
mMap.setMapPosition(53.5620092, 9.9866457, 1 << 16);
|
||||
|
||||
//VectorDataset data = (VectorDataset) JeoTest.getJsonData("states.json", true);
|
||||
//Style style = JeoTest.getStyle();
|
||||
//mMap.layers().add(new JeoVectorLayer(mMap, data, style));
|
||||
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
GdxMapApp.init();
|
||||
GdxMapApp.run(new LayerTest(), null, 256);
|
||||
}
|
||||
}
|
||||
///*
|
||||
// * Copyright 2014 Hannes Janetzek
|
||||
// * Copyright 2016-2017 devemux86
|
||||
// *
|
||||
// * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
|
||||
// *
|
||||
// * This program is free software: you can redistribute it and/or modify it under the
|
||||
// * terms of the GNU Lesser General Public License as published by the Free Software
|
||||
// * Foundation, either version 3 of the License, or (at your option) any later version.
|
||||
// *
|
||||
// * This program is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
// * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
// *
|
||||
// * You should have received a copy of the GNU Lesser General Public License along with
|
||||
// * this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
// */
|
||||
//package org.oscim.test.jeo;
|
||||
//
|
||||
//import org.jeo.map.Style;
|
||||
//import org.jeo.vector.VectorDataset;
|
||||
//import org.oscim.backend.canvas.Color;
|
||||
//import org.oscim.gdx.GdxMap;
|
||||
//import org.oscim.gdx.GdxMapApp;
|
||||
//import org.oscim.layers.JeoVectorLayer;
|
||||
//import org.oscim.layers.OSMIndoorLayer;
|
||||
//import org.oscim.layers.tile.bitmap.BitmapTileLayer;
|
||||
//import org.oscim.test.JeoTest;
|
||||
//import org.oscim.theme.styles.TextStyle;
|
||||
//
|
||||
//import java.io.IOException;
|
||||
//import java.io.InputStream;
|
||||
//import java.net.URL;
|
||||
//import java.net.URLConnection;
|
||||
//
|
||||
//import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;
|
||||
//
|
||||
//public class LayerTest extends GdxMap {
|
||||
//
|
||||
// // from http://overpass-turbo.eu/s/2vp
|
||||
// String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
|
||||
//
|
||||
// private OSMIndoorLayer mIndoorLayer;
|
||||
//
|
||||
// @Override
|
||||
// public void createLayers() {
|
||||
// mMap.setBaseMap(new BitmapTileLayer(mMap, STAMEN_TONER.build()));
|
||||
//
|
||||
// mMap.addTask(new Runnable() {
|
||||
// @Override
|
||||
// public void run() {
|
||||
// try {
|
||||
// URL url = new URL(PATH);
|
||||
// URLConnection conn = url.openConnection();
|
||||
// InputStream is = conn.getInputStream();
|
||||
//
|
||||
// VectorDataset data = JeoTest.readGeoJson(is);
|
||||
// Style style = JeoTest.getStyle();
|
||||
// TextStyle textStyle = TextStyle.builder()
|
||||
// .isCaption(true)
|
||||
// .fontSize(16).color(Color.BLACK)
|
||||
// .strokeWidth(2.2f).strokeColor(Color.WHITE)
|
||||
// .build();
|
||||
// mIndoorLayer = new OSMIndoorLayer(mMap, data, style, textStyle);
|
||||
// mIndoorLayer.activeLevels[0] = true;
|
||||
// mIndoorLayer.activeLevels[1] = true;
|
||||
// mIndoorLayer.activeLevels[2] = true;
|
||||
// mIndoorLayer.activeLevels[3] = true;
|
||||
//
|
||||
// mMap.layers().add(new JeoVectorLayer(mMap, data, style));
|
||||
// mMap.layers().add(mIndoorLayer);
|
||||
//
|
||||
// mMap.updateMap(true);
|
||||
//
|
||||
// } catch (IOException e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// mMap.setMapPosition(53.5620092, 9.9866457, 1 << 16);
|
||||
//
|
||||
// //VectorDataset data = (VectorDataset) JeoTest.getJsonData("states.json", true);
|
||||
// //Style style = JeoTest.getStyle();
|
||||
// //mMap.layers().add(new JeoVectorLayer(mMap, data, style));
|
||||
//
|
||||
// }
|
||||
//
|
||||
// public static void main(String[] args) {
|
||||
// GdxMapApp.init();
|
||||
// GdxMapApp.run(new LayerTest(), null, 256);
|
||||
// }
|
||||
//}
|
||||
|
@ -1,47 +1,47 @@
|
||||
/*
|
||||
* Copyright 2016-2017 devemux86
|
||||
*
|
||||
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under the
|
||||
* terms of the GNU Lesser General Public License as published by the Free Software
|
||||
* Foundation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.oscim.test.jeo;
|
||||
|
||||
import org.oscim.gdx.GdxMapApp;
|
||||
import org.oscim.layers.tile.vector.VectorTileLayer;
|
||||
import org.oscim.renderer.MapRenderer;
|
||||
import org.oscim.theme.carto.RenderTheme;
|
||||
import org.oscim.tiling.source.UrlTileSource;
|
||||
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
|
||||
|
||||
public class ThemeTest extends GdxMapApp {
|
||||
|
||||
public static void main(String[] args) {
|
||||
GdxMapApp.init();
|
||||
GdxMapApp.run(new ThemeTest(), null, 256);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createLayers() {
|
||||
UrlTileSource ts = new OSciMap4TileSource();
|
||||
|
||||
VectorTileLayer l = mMap.setBaseMap(ts);
|
||||
|
||||
l.setRenderTheme(new RenderTheme());
|
||||
|
||||
MapRenderer.setBackgroundColor(0xffcccccc);
|
||||
|
||||
// mMap.getLayers().add(new LabelLayer(mMap,
|
||||
// mMapLayer.getTileLayer()));
|
||||
// mMap.getLayers().add(new JeoMapLayer(mMap));
|
||||
}
|
||||
}
|
||||
///*
|
||||
// * Copyright 2016-2017 devemux86
|
||||
// *
|
||||
// * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
|
||||
// *
|
||||
// * This program is free software: you can redistribute it and/or modify it under the
|
||||
// * terms of the GNU Lesser General Public License as published by the Free Software
|
||||
// * Foundation, either version 3 of the License, or (at your option) any later version.
|
||||
// *
|
||||
// * This program is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
// * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||
// *
|
||||
// * You should have received a copy of the GNU Lesser General Public License along with
|
||||
// * this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
// */
|
||||
//package org.oscim.test.jeo;
|
||||
//
|
||||
//import org.oscim.gdx.GdxMapApp;
|
||||
//import org.oscim.layers.tile.vector.VectorTileLayer;
|
||||
//import org.oscim.renderer.MapRenderer;
|
||||
//import org.oscim.theme.carto.RenderTheme;
|
||||
//import org.oscim.tiling.source.UrlTileSource;
|
||||
//import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
|
||||
//
|
||||
//public class ThemeTest extends GdxMapApp {
|
||||
//
|
||||
// public static void main(String[] args) {
|
||||
// GdxMapApp.init();
|
||||
// GdxMapApp.run(new ThemeTest(), null, 256);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void createLayers() {
|
||||
// UrlTileSource ts = new OSciMap4TileSource();
|
||||
//
|
||||
// VectorTileLayer l = mMap.setBaseMap(ts);
|
||||
//
|
||||
// l.setRenderTheme(new RenderTheme());
|
||||
//
|
||||
// MapRenderer.setBackgroundColor(0xffcccccc);
|
||||
//
|
||||
// // mMap.getLayers().add(new LabelLayer(mMap,
|
||||
// // mMapLayer.getTileLayer()));
|
||||
// // mMap.getLayers().add(new JeoMapLayer(mMap));
|
||||
// }
|
||||
//}
|
||||
|
Loading…
x
Reference in New Issue
Block a user