Skip to content

Commit 0242741

Browse files
committed
Merge pull request #145 from AmericanRedCross/fp-overlay
Field Paper Atlas Integration
2 parents d1ec6ba + 9575f58 commit 0242741

File tree

14 files changed

+520
-25
lines changed

14 files changed

+520
-25
lines changed

MapboxAndroidSDK/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencies {
2929
compile 'com.nineoldandroids:library:2.4.0'
3030
compile 'com.jakewharton:disklrucache:2.0.2'
3131
compile 'commons-codec:commons-codec:1.10'
32+
compile 'commons-io:commons-io:2.4'
3233
}
3334

3435
android {

MapboxAndroidSDK/src/main/java/com/spatialdev/osm/OSMMap.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
import com.spatialdev.osm.renderer.OSMOverlay;
2929
import com.vividsolutions.jts.geom.Envelope;
3030

31+
import org.fieldpapers.model.FPAtlas;
32+
3133
import java.util.List;
3234

3335
public class OSMMap implements MapViewListener, MapListener {
3436

3537
// DEBUG MODE - SHOW ENVELOPE AROUND TAP ON MAP
36-
private static final boolean DEBUG = true;
38+
private static final boolean DEBUG = false;
3739

3840
private MapView mapView;
3941
private JTSModel jtsModel;
@@ -124,6 +126,11 @@ public void onLongPressMarker(MapView pMapView, Marker pMarker) {
124126

125127
@Override
126128
public void onTapMap(MapView pMapView, ILatLng pPosition) {
129+
FPAtlas atlas = FPAtlas.singleton();
130+
if (atlas != null) {
131+
atlas.onTapMap(pMapView, pPosition);
132+
}
133+
127134
float zoom = pMapView.getZoomLevel();
128135

129136
OSMElement.deselectAll();

MapboxAndroidSDK/src/main/java/com/spatialdev/osm/model/JTSModel.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,11 @@ public OSMElement queryFromTap(ILatLng latLng, float zoom) {
166166

167167
}
168168

169-
// Log.i("queryFromTap closestElement", closestElement.toString());
170-
return closestElement;
169+
Geometry closestElementGeom = closestElement.getJTSGeom();
170+
if (closestElementGeom != null && closestElementGeom.intersects(geometryFactory.createPoint(coord))) {
171+
return closestElement;
172+
}
173+
return null;
171174
}
172175

173176
private Envelope createTapEnvelope(Coordinate coord, double lat, double lng, float zoom) {

MapboxAndroidSDK/src/main/java/com/spatialdev/osm/renderer/OSMLine.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@
1313
public class OSMLine extends OSMPath {
1414

1515
// OSM GREEN
16-
private static final int DEFAULT_A = 125;
17-
private static final int DEFAULT_R = 126;
18-
private static final int DEFAULT_G = 188;
19-
private static final int DEFAULT_B = 111;
20-
private static final float DEFAULT_WIDTH = 13.0f;
16+
public static final int DEFAULT_A = 125;
17+
public static final int DEFAULT_R = 126;
18+
public static final int DEFAULT_G = 188;
19+
public static final int DEFAULT_B = 111;
20+
public static final float DEFAULT_WIDTH = 13.0f;
2121

2222
// GOLD
23-
private static final int DEFAULT_SELECTED_A = 180;
24-
private static final int DEFAULT_SELECTED_R = 255;
25-
private static final int DEFAULT_SELECTED_G = 140;
26-
private static final int DEFAULT_SELECTED_B = 0;
27-
private static final float DEFAULT_SELECTED_WIDTH = 15.0f;
23+
public static final int DEFAULT_SELECTED_A = 180;
24+
public static final int DEFAULT_SELECTED_R = 255;
25+
public static final int DEFAULT_SELECTED_G = 140;
26+
public static final int DEFAULT_SELECTED_B = 0;
27+
public static final float DEFAULT_SELECTED_WIDTH = 15.0f;
2828

2929
// MAROON
30-
private static final int DEFAULT_EDITED_A = 100;
31-
private static final int DEFAULT_EDITED_R = 245;
32-
private static final int DEFAULT_EDITED_G = 17;
33-
private static final int DEFAULT_EDITED_B = 135;
30+
public static final int DEFAULT_EDITED_A = 100;
31+
public static final int DEFAULT_EDITED_R = 245;
32+
public static final int DEFAULT_EDITED_G = 17;
33+
public static final int DEFAULT_EDITED_B = 135;
3434

3535
private float width;
3636
private int a;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.fieldpapers.listeners;
2+
3+
public interface FPListener {
4+
5+
void onMapCenterPageChangeMessage(String msg);
6+
7+
}

0 commit comments

Comments
 (0)