xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Samples: multiple map views improvements #196 #194

Browse Source
This commit is contained in:
Emux
2016-10-02 22:05:29 +03:00
parent e8a105d892
commit bed6f8f0f2
3 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vtm-android-example/AndroidManifest.xml
View File

@@ -29,9 +29,6 @@
<activity <activity
android:name=".BitmapTileMapActivity" android:name=".BitmapTileMapActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
<activity
android:name=".MultiMapActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
<activity <activity
android:name=".JeoIndoorMapActivity" android:name=".JeoIndoorMapActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
@@ -50,6 +47,9 @@
<activity <activity
android:name=".MarkerOverlayActivity" android:name=".MarkerOverlayActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
<activity
android:name=".MultiMapActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
<activity <activity
android:name=".OsmJsonMapActivity" android:name=".OsmJsonMapActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />

8
vtm-android-example/res/layout/activity_map_multi.xml
View File

@@ -6,13 +6,13 @@
<org.oscim.android.MapView <org.oscim.android.MapView
android:id="@+id/mapView1" android:id="@+id/mapView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="0dip"
android:layout_height="0dip" /> android:layout_weight="1" />
<org.oscim.android.MapView <org.oscim.android.MapView
android:id="@+id/mapView2" android:id="@+id/mapView2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="0dip"
android:layout_height="0dip" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>

67
vtm-android-example/src/org/oscim/android/test/MultiMapActivity.java
View File

@@ -1,4 +1,5 @@
/* /*
* Copyright 2016 Marvin W
* Copyright 2016 devemux86 * Copyright 2016 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@@ -22,65 +23,51 @@ import android.os.Bundle;
import org.oscim.android.MapPreferences; import org.oscim.android.MapPreferences;
import org.oscim.android.MapView; import org.oscim.android.MapView;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.map.Map;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import org.oscim.theme.VtmThemes;
import org.oscim.layers.GroupLayer;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;
import org.oscim.map.Map;
import org.oscim.theme.VtmThemes;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
public class MultiMapActivity extends Activity { public class MultiMapActivity extends Activity {
MapView mMapView1; private MapView mMapView1, mMapView2;
MapView mMapView2; private MapPreferences mPrefs1, mPrefs2;
Map mMap1;
Map mMap2;
MapPreferences mPrefs;
VectorTileLayer mBaseLayer1;
VectorTileLayer mBaseLayer2;
TileSource mTileSource;
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Tile.SIZE = Tile.calculateTileSize(getResources().getDisplayMetrics().scaledDensity); Tile.SIZE = Tile.calculateTileSize(getResources().getDisplayMetrics().scaledDensity);
setContentView(R.layout.activity_map_multi); setContentView(R.layout.activity_map_multi);
setTitle(getClass().getSimpleName()); setTitle(getClass().getSimpleName());
mTileSource = new OSciMap4TileSource(); // 1st map view
mMapView1 = (MapView) findViewById(R.id.mapView1); mMapView1 = (MapView) findViewById(R.id.mapView1);
mMap1 = mMapView1.map(); Map map1 = mMapView1.map();
mBaseLayer1 = mMap1.setBaseMap(mTileSource); mPrefs1 = new MapPreferences(MultiMapActivity.class.getName() + "1", this);
VectorTileLayer baseLayer1 = map1.setBaseMap(new OSciMap4TileSource());
GroupLayer groupLayer1 = new GroupLayer(mMap1); map1.layers().add(new BuildingLayer(map1, baseLayer1));
groupLayer1.layers.add(new BuildingLayer(mMap1, mBaseLayer1)); map1.layers().add(new LabelLayer(map1, baseLayer1));
groupLayer1.layers.add(new LabelLayer(mMap1, mBaseLayer1)); map1.setTheme(VtmThemes.DEFAULT);
mMap1.layers().add(groupLayer1);
mMap1.setTheme(VtmThemes.DEFAULT);
// 2nd map view
mMapView2 = (MapView) findViewById(R.id.mapView2); mMapView2 = (MapView) findViewById(R.id.mapView2);
mMap2 = mMapView2.map(); Map map2 = mMapView2.map();
mBaseLayer2 = mMap2.setBaseMap(mTileSource); mPrefs2 = new MapPreferences(MultiMapActivity.class.getName() + "2", this);
VectorTileLayer baseLayer2 = map2.setBaseMap(new OSciMap4TileSource());
GroupLayer groupLayer2 = new GroupLayer(mMap2); map2.layers().add(new BuildingLayer(map2, baseLayer2));
groupLayer2.layers.add(new BuildingLayer(mMap2, mBaseLayer2)); map2.layers().add(new LabelLayer(map2, baseLayer2));
groupLayer2.layers.add(new LabelLayer(mMap2, mBaseLayer2)); map2.setTheme(VtmThemes.DEFAULT);
mMap2.layers().add(groupLayer2);
mMap2.setTheme(VtmThemes.DEFAULT);
mPrefs = new MapPreferences(MapActivity.class.getName(), this);
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
mPrefs.load(mMapView1.map()); mPrefs1.load(mMapView1.map());
mMapView1.onResume(); mMapView1.onResume();
mPrefs2.load(mMapView2.map());
mMapView2.onResume(); mMapView2.onResume();
} }
@@ -89,7 +76,9 @@ public class MultiMapActivity extends Activity {
super.onPause(); super.onPause();
mMapView1.onPause(); mMapView1.onPause();
mPrefs1.save(mMapView1.map());
mMapView2.onPause(); mMapView2.onPause();
mPrefs.save(mMapView1.map()); mPrefs2.save(mMapView2.map());
} }
} }