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

Gradle 4 and Android plugin 3 improvements #433, fix #436

Browse Source
This commit is contained in:
Emux
2017-10-30 08:47:09 +02:00
parent 53dbb737fb
commit d23bca9c7f
13 changed files with 28 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vtm-android-example/src/android-logger.properties
View File

@@ -1 +0,0 @@
root=DEBUG:%logger

105
vtm-android-example/src/org/oscim/android/test/MapFragmentActivity.java
View File

@@ -1,105 +0,0 @@
/*
* Copyright 2016 Mathieu De Brito
* Copyright 2017 devemux86
*
* 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.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import org.oscim.android.MapPreferences;
import org.oscim.android.MapView;
import org.oscim.core.MapPosition;
import org.oscim.layers.GroupLayer;
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.theme.VtmThemes;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
public class MapFragmentActivity extends FragmentActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_map_fragment);
setTitle(getClass().getSimpleName());
MapFragment newFragment = new MapFragment();
getSupportFragmentManager()
.beginTransaction()
.add(R.id.fragment_container, newFragment)
.commit();
}
public static class MapFragment extends Fragment {
private MapView mMapView;
private MapPreferences mPrefs;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View contentView = super.onCreateView(inflater, container, savedInstanceState);
if (contentView == null) {
contentView = inflater.inflate(R.layout.fragment_map, container, false);
}
return contentView;
}
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mMapView = (MapView) view.findViewById(R.id.mapView);
mPrefs = new MapPreferences(MapFragment.class.getName(), getContext());
VectorTileLayer l = mMapView.map().setBaseMap(new OSciMap4TileSource());
GroupLayer groupLayer = new GroupLayer(mMapView.map());
groupLayer.layers.add(new BuildingLayer(mMapView.map(), l));
groupLayer.layers.add(new LabelLayer(mMapView.map(), l));
mMapView.map().layers().add(groupLayer);
mMapView.map().setTheme(VtmThemes.DEFAULT);
// set initial position on first run
MapPosition pos = new MapPosition();
mMapView.map().getMapPosition(pos);
if (pos.x == 0.5 && pos.y == 0.5)
mMapView.map().setMapPosition(53.08, 8.83, Math.pow(2, 16));
}
@Override
public void onResume() {
super.onResume();
mPrefs.load(mMapView.map());
mMapView.onResume();
}
@Override
public void onPause() {
super.onPause();
mMapView.onPause();
mPrefs.save(mMapView.map());
}
}
}

88
vtm-android-example/src/org/oscim/android/test/MapPositionActivity.java
View File

@@ -1,88 +0,0 @@
/*
* Copyright 2016 Mathieu De Brito
* Copyright 2016 devemux86
*
* 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.os.Bundle;
import android.widget.Toast;
import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection;
/**
* Test consecutive map position animations.
*/
public class MapPositionActivity extends SimpleMapActivity {
// Reuse MapPosition instance
private final MapPosition mapPosition = new MapPosition();
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
runTest();
}
@Override
protected void onResume() {
super.onResume();
/* ignore saved position */
mMap.setMapPosition(0, 0, 1 << 2);
}
private void animateToBearing(final float bearing) {
mMap.postDelayed(new Runnable() {
@Override
public void run() {
mMap.getMapPosition(mapPosition);
mapPosition.setBearing(bearing);
mMap.animator().animateTo(1000, mapPosition);
}
}, 500);
}
private void animateToLocation(final double latitude, final double longitude) {
mMap.postDelayed(new Runnable() {
@Override
public void run() {
mMap.getMapPosition(true, mapPosition);
mapPosition.setPosition(latitude, longitude);
mMap.animator().animateTo(1000, mapPosition);
}
}, 1000);
}
private void runTest() {
// 1 - ask for a bearing
final float bearing = 180;
animateToBearing(bearing);
// 2 - ask for a new location
double latitude = Math.random() * MercatorProjection.LATITUDE_MAX;
double longitude = Math.random() * MercatorProjection.LONGITUDE_MAX;
animateToLocation(latitude, longitude);
// If animations were merged, final bearing should be 180°
mMap.postDelayed(new Runnable() {
@Override
public void run() {
mMap.getMapPosition(mapPosition);
Toast.makeText(MapPositionActivity.this, "Bearing expected: " + bearing + ", got: " + mapPosition.getBearing(), Toast.LENGTH_LONG).show();
}
}, 3000);
}
}

2
vtm-android-example/src/org/oscim/android/test/Samples.java
View File

@@ -118,14 +118,12 @@ public class Samples extends Activity {
linearLayout.addView(createLabel("User Interaction"));
linearLayout.addView(createButton(NewGesturesActivity.class));
linearLayout.addView(createButton(LayerGroupActivity.class));
linearLayout.addView(createButton(MapFragmentActivity.class));
linearLayout.addView(createLabel("Dual Map Views"));
linearLayout.addView(createButton(MultiMapActivity.class));
linearLayout.addView(createLabel("Experiments"));
linearLayout.addView(createButton(ReverseGeocodeActivity.class));
linearLayout.addView(createButton(MapPositionActivity.class));
linearLayout.addView(createButton(S3DBMapActivity.class));
linearLayout.addView(createButton(ThemeStylerActivity.class));
linearLayout.addView(createButton(JeoIndoorMapActivity.class));