Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Field Paper Atlas Integration #145

Merged
merged 12 commits into from
Apr 23, 2016
Merged

Field Paper Atlas Integration #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d1520bf
#45 getting started with field paper overlay in Mapbox Android SDK Le…
hallahan Apr 21, 2016
d4c878c
#45 FPAtlas build out singleton usage
hallahan Apr 21, 2016
9b4fb89
#45 FPListener in MapActivity and FPAtlas is a MapListener
hallahan Apr 21, 2016
3470e18
#45 Showing Field Papers title and page number that the center of the…
hallahan Apr 21, 2016
cc44b6f
#45 Trying out PathOverlay of pages
hallahan Apr 21, 2016
4a0b206
#45 selected path overlay colors green
hallahan Apr 22, 2016
158045e
#45 puts the selected field paper page overlay in front of the others…
hallahan Apr 22, 2016
a7b94b7
#45 Map taps will also select a FP page. Better view for showing the …
hallahan Apr 22, 2016
636f6ae
#45 Only shows the TextView name of the page when we have one selected
hallahan Apr 23, 2016
19c0c37
#45 When we are outside of all of the pages, the selected path overla…
hallahan Apr 23, 2016
4f8a8ef
#45 STRTree is performing better - queries only return objects in the…
hallahan Apr 23, 2016
9575f58
Closes #119
hallahan Apr 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MapboxAndroidSDK/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dependencies {
compile 'com.nineoldandroids:library:2.4.0'
compile 'com.jakewharton:disklrucache:2.0.2'
compile 'commons-codec:commons-codec:1.10'
compile 'commons-io:commons-io:2.4'
}

android {
Expand Down
9 changes: 8 additions & 1 deletion MapboxAndroidSDK/src/main/java/com/spatialdev/osm/OSMMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@
import com.spatialdev.osm.renderer.OSMOverlay;
import com.vividsolutions.jts.geom.Envelope;

import org.fieldpapers.model.FPAtlas;

import java.util.List;

public class OSMMap implements MapViewListener, MapListener {

// DEBUG MODE - SHOW ENVELOPE AROUND TAP ON MAP
private static final boolean DEBUG = true;
private static final boolean DEBUG = false;

private MapView mapView;
private JTSModel jtsModel;
Expand Down Expand Up @@ -124,6 +126,11 @@ public void onLongPressMarker(MapView pMapView, Marker pMarker) {

@Override
public void onTapMap(MapView pMapView, ILatLng pPosition) {
FPAtlas atlas = FPAtlas.singleton();
if (atlas != null) {
atlas.onTapMap(pMapView, pPosition);
}

float zoom = pMapView.getZoomLevel();

OSMElement.deselectAll();
Expand Down
7 changes: 5 additions & 2 deletions MapboxAndroidSDK/src/main/java/com/spatialdev/osm/model/JTSModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,11 @@ public OSMElement queryFromTap(ILatLng latLng, float zoom) {

}

// Log.i("queryFromTap closestElement", closestElement.toString());
return closestElement;
Geometry closestElementGeom = closestElement.getJTSGeom();
if (closestElementGeom != null && closestElementGeom.intersects(geometryFactory.createPoint(coord))) {
return closestElement;
}
return null;
}

private Envelope createTapEnvelope(Coordinate coord, double lat, double lng, float zoom) {
Expand Down
28 changes: 14 additions & 14 deletions MapboxAndroidSDK/src/main/java/com/spatialdev/osm/renderer/OSMLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@
public class OSMLine extends OSMPath {

// OSM GREEN
private static final int DEFAULT_A = 125;
private static final int DEFAULT_R = 126;
private static final int DEFAULT_G = 188;
private static final int DEFAULT_B = 111;
private static final float DEFAULT_WIDTH = 13.0f;
public static final int DEFAULT_A = 125;
public static final int DEFAULT_R = 126;
public static final int DEFAULT_G = 188;
public static final int DEFAULT_B = 111;
public static final float DEFAULT_WIDTH = 13.0f;

// GOLD
private static final int DEFAULT_SELECTED_A = 180;
private static final int DEFAULT_SELECTED_R = 255;
private static final int DEFAULT_SELECTED_G = 140;
private static final int DEFAULT_SELECTED_B = 0;
private static final float DEFAULT_SELECTED_WIDTH = 15.0f;
public static final int DEFAULT_SELECTED_A = 180;
public static final int DEFAULT_SELECTED_R = 255;
public static final int DEFAULT_SELECTED_G = 140;
public static final int DEFAULT_SELECTED_B = 0;
public static final float DEFAULT_SELECTED_WIDTH = 15.0f;

// MAROON
private static final int DEFAULT_EDITED_A = 100;
private static final int DEFAULT_EDITED_R = 245;
private static final int DEFAULT_EDITED_G = 17;
private static final int DEFAULT_EDITED_B = 135;
public static final int DEFAULT_EDITED_A = 100;
public static final int DEFAULT_EDITED_R = 245;
public static final int DEFAULT_EDITED_G = 17;
public static final int DEFAULT_EDITED_B = 135;

private float width;
private int a;
Expand Down
7 changes: 7 additions & 0 deletions MapboxAndroidSDK/src/main/java/org/fieldpapers/listeners/FPListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package org.fieldpapers.listeners;

public interface FPListener {

void onMapCenterPageChangeMessage(String msg);

}
Loading