Get map image if none was selected

Use another server

Get map image if none was selected
Use another server
florian staine
1 parent e8cf6b8b
Showing 3 changed files with 95 additions and 12 deletions Show diff stats
app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java
app/src/main/java/fr/utbm/lo53/p2017/positionningapp/network/URLSolver.java
app/src/main/res/layout/content_positioning.xml
 package fr.utbm.lo53.p2017.positionningapp;
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.constraint.ConstraintLayout;
@@ -18,17 +19,22 @@ import com.android.volley.Request;
 import com.android.volley.RequestQueue;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.android.volley.toolbox.ImageRequest;
 import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.Volley;
+import org.json.JSONException;
 import org.json.JSONObject;
+import java.util.Random;
+
 public class PositioningActivity extends BaseActivity {
     private static final String TAG = "PositioningActivity";
     private ConstraintLayout start_layout;
     private TextView textView;
+    private ImageView mapView;
     private Animation hideAnimation;
@@ -37,31 +43,46 @@ public class PositioningActivity extends BaseActivity {
     private boolean isLocating = false;
-    // Request a string response from the provided URL.
-    private JsonObjectRequest stringRequest;
+    private Integer mapId = null;
     private final Handler handler = new Handler();
     private final Runnable runnable = new Runnable() {
         @Override
         public void run() {
             // Create request
-            stringRequest = new JsonObjectRequest(Request.Method.GET,
+            JsonObjectRequest locateRequest = new JsonObjectRequest(Request.Method.GET,
                     getURLSolver().locateURL(),
                     null,
                     new Response.Listener<JSONObject>() {
                         @Override
                         public void onResponse(JSONObject response) {
-                            textView.setText("Response is: "+ response.toString().substring(0,500));
+                            try {
+                                float x = (float) response.getDouble("x");
+                                float y = (float) response.getDouble("y");
+                                int mapId = response.getInt("map_id");
+                                if (hasCorrectMap(mapId)) {
+                                    putPoint(x, y);
+                                    textView.setText("");
+                                } else {
+                                    getMap(mapId);
+                                }
+                            } catch (JSONException e) {
+                                Log.e(TAG, e.toString());
+                                textView.setText("Could not parse the response !");
+                            }
                         }
                     }, new Response.ErrorListener() {
                 @Override
                 public void onErrorResponse(VolleyError error) {
+                    // TODO: Remove random position
+                    Random r = new Random();
+                    putPoint(r.nextFloat(), r.nextFloat());
                     textView.setText("Error: " + error.getMessage());
                     Log.i(TAG, "Error during location request");
                 }
             });
-            Log.v(TAG, "" + stringRequest);
-            queue.add(stringRequest);
+            Log.v(TAG, "" + locateRequest);
+            queue.add(locateRequest);
             handler.postDelayed(runnable, 1000);
         }
@@ -79,6 +100,8 @@ public class PositioningActivity extends BaseActivity {
         textView = (TextView) findViewById(R.id.ID_yolo);
+        mapView = (ImageView) findViewById(R.id.map);
+
         queue = Volley.newRequestQueue(this);
     }
@@ -131,4 +154,35 @@ public class PositioningActivity extends BaseActivity {
         });
         hideAnimation = animation;
     }
+
+    private void putPoint(float x, float y) {
+        ImageView mapMarker = (ImageView) findViewById(R.id.map_marker);
+        float x_on_map = (float) mapView.getWidth() * x;    // in px
+        float y_on_map = (float) mapView.getHeight() * y;
+        mapMarker.setX(mapView.getX() + x_on_map - mapMarker.getWidth()/2);
+        mapMarker.setY(mapView.getY() + y_on_map - mapMarker.getHeight());
+        mapMarker.setVisibility(View.VISIBLE);
+    }
+
+    private boolean hasCorrectMap(int mapId) {
+        return (this.mapId != null && this.mapId.equals(mapId));
+    }
+
+    private void getMap(int mapId) {
+        ImageRequest mapRequest = new ImageRequest(
+            getURLSolver().mapDataURL(mapId),
+            new Response.Listener<Bitmap>() {
+                @Override
+                public void onResponse(Bitmap bitmap) {
+                    mapView.setImageBitmap(bitmap);
+                }
+            }, 0, 0, null,
+            new Response.ErrorListener() {
+                public void onErrorResponse(VolleyError error) {
+                    mapView.setImageResource(R.drawable.map2);
+                    textView.setText("Can't load map!!!");
+                }
+        });
+        queue.add(mapRequest);
+    }
 }
@@ -63,4 +63,10 @@ public class URLSolver implements SharedPreferences.OnSharedPreferenceChangeList
                 .appendPath("request");
         return b.build().toString();
     }
+
+    public String mapDataURL(int mapId) {
+        Uri.Builder b = baseURL();
+        b.appendPath("static").appendPath("map.png");
+        return b.build().toString();
+    }
 }
@@ -9,33 +9,56 @@
     tools:showIn="@layout/activity_positioning">
     <ImageView
-        android:id="@+id/imageView"
+        android:id="@+id/map"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="0dp"
         android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:adjustViewBounds="true"
         android:scaleType="fitXY"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/map"
+        app:srcCompat="@drawable/map2" />
+
+    <ImageView
+        android:id="@+id/map_marker"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginBottom="0dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="0dp"
         android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp" />
+        android:layout_marginTop="0dp"
+        android:adjustViewBounds="false"
+        android:cropToPadding="false"
+        app:layout_constraintBottom_toBottomOf="@+id/Map"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/Map"
+        app:layout_constraintVertical_bias="0.03"
+        app:srcCompat="@drawable/map_marker" />
     <TextView
         android:id="@+id/ID_yolo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="TextView"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        tools:layout_editor_absoluteX="0dp"
+        android:layout_marginTop="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/start_layout" />
     <android.support.constraint.ConstraintLayout
         android:id="@+id/start_layout"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:onClick="startLocating"
-        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"