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

Enable placement of labels / symbols on polygons (after overzoom)

Browse Source
This commit is contained in:
Emux
2019-03-02 14:40:11 +02:00
parent 5eda5b78a6
commit b5076c9cd2
6 changed files with 8 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/Changelog.md
View File

@@ -12,6 +12,10 @@
- vtm-models module [#580](https://github.com/mapsforge/vtm/issues/580)
- ViewController refactor [#625](https://github.com/mapsforge/vtm/pull/625)
- `getMapViewCenter`, `setMapViewCenter` with pivotX, pivotY
- Enable optimal placement of labels or symbols on polygons
- `Parameters.POLY_LABEL`
- Enable placement of symbols on polygons
- `Parameters.POLY_SYMBOL`
- OpenGL ES 3.0 support [#646](https://github.com/mapsforge/vtm/issues/646)
- OpenGL ES 2.0 complete [#642](https://github.com/mapsforge/vtm/pull/642)
- libGDX 1.9.9 [#635](https://github.com/mapsforge/vtm/issues/635)

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

@@ -79,9 +79,6 @@
<activity
android:name=".MapsforgeActivity$ThemeFilePicker"
android:configChanges="keyboardHidden|orientation|screenSize" />
<activity
android:name=".MapsforgePolyLabelActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
<activity
android:name=".MapsforgeS3DBActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />

36
vtm-android-example/src/org/oscim/android/test/MapsforgePolyLabelActivity.java
View File

@@ -1,36 +0,0 @@
/*
* Copyright 2017-2018 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 org.oscim.utils.Parameters;
public class MapsforgePolyLabelActivity extends MapsforgeActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
Parameters.POLY_LABEL = true;
super.onCreate(savedInstanceState);
}
@Override
protected void onDestroy() {
super.onDestroy();
Parameters.POLY_LABEL = false;
}
}

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

@@ -1,7 +1,7 @@
/*
* Copyright 2010, 2011, 2012, 2013 mapsforge.org
* Copyright 2013 Hannes Janetzek
* Copyright 2016-2018 devemux86
* Copyright 2016-2019 devemux86
* Copyright 2016 mar-v-in
* Copyright 2016 Mathieu de Brito
* Copyright 2017-2018 Longri
@@ -108,7 +108,6 @@ public class Samples extends Activity {
linearLayout.addView(createLabel("Vector Features"));
linearLayout.addView(createButton(MapsforgeStyleActivity.class));
linearLayout.addView(createButton(MapsforgePolyLabelActivity.class));
linearLayout.addView(createButton(MapsforgeS3DBActivity.class));
linearLayout.addView(createButton(AtlasThemeActivity.class));
linearLayout.addView(createButton(POTTextureActivity.class));

34
vtm-playground/src/org/oscim/test/MapsforgePolyLabelTest.java
View File

@@ -1,34 +0,0 @@
/*
* 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.test;
import org.oscim.gdx.GdxMapApp;
import org.oscim.utils.Parameters;
import java.io.File;
public class MapsforgePolyLabelTest extends MapsforgeTest {
private MapsforgePolyLabelTest(File mapFile) {
super(mapFile);
Parameters.POLY_LABEL = true;
}
public static void main(String[] args) {
GdxMapApp.init();
GdxMapApp.run(new MapsforgePolyLabelTest(getMapFile(args)));
}
}

6
vtm/src/org/oscim/utils/Parameters.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2018 devemux86
* Copyright 2017-2019 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
@@ -44,12 +44,12 @@ public final class Parameters {
/**
* Optimal placement of labels or symbols on polygons.
*/
public static boolean POLY_LABEL = false;
public static boolean POLY_LABEL = true;
/**
* Placement of symbols on polygons.
*/
public static boolean POLY_SYMBOL = false;
public static boolean POLY_SYMBOL = true;
/**
* POT textures in themes.