Merge pull request #6 from ushahidi/fFix/Geocoding-and-edit

Fix/geocoding and edit

config.xml

@@ -3,7 +3,7 @@
     <name>Ushahidi</name>
     <description>Ushahidi Mobile</description>
     <author email="[email protected]" href="https://www.ushahidi.com/">Ushahidi</author>
-    <content src="index.html" />
+    <content original-src="index.html" src="http://192.168.68.106:8100" />
     <access allows-arbitrary-loads-for-media="true" allows-arbitrary-loads-in-web-content="true" allows-local-networking="true" origin="*" requires-certificate-transparency="false" requires-forward-secrecy="false" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
@@ -26,6 +26,12 @@
     <allow-navigation href="http://ionic.local/*" />
     <allow-navigation href="http://localhost:3000/*" />
     <allow-navigation href="http://localhost:8080/*" />
+    <allow-navigation href="http://localhost:8100/*" />
+    <allow-navigation href="http://localhost:35729/*" />
+    <allow-navigation href="http://localhost:53703/*" />
+    <access origin="*" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
     <platform name="android">
         <allow-intent href="market:*" />
         <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application">

src/assets/i18n/en.json

@@ -187,6 +187,7 @@
 	"TOS_PLEASE_REVIEW": "Please review these documents carefully and accept the terms in order to continue to use the services.",
 	"TOS_AGREE_TERMS": "I agree to the Terms of Service.",
 	"TOS_ACCEPT_CONTINUE": "Accept and Continue",
+	"USE_LOCATION": "Use my location",
 	"USER": "User",
 	"USER_": "User...",
 	"USER_LOGIN": "Log in",
@@ -215,6 +216,7 @@
 	"USER_SIGNING_UP_": "Signing up...",
 	"USER_SIGNUP_SUCCESS": "Sign up successful",
 	"USER_SIGNUP_FAILURE": "Problem Signing Up",
+	"SEARCH": "Search",
   "STATUS": "Status",
 	"STATUS_PENDING": "Pending",
   "STATUS_ARCHIVED": "Archived",

src/components/input-location/input-location.html

@@ -24,17 +24,20 @@
   <button ion-button margin-left icon-left text-uppercase small color="secondary" *ngIf="authorized == false" (click)="showSettings($event)">
     <ion-icon ios="ios-cog" md="md-cog"></ion-icon> {{'INPUT_LOCATION_SETTINGS' | translate}}
   </button>
-  <ion-row margin-left margin-right margin-top margin-bottom *ngIf="(authorized == false || located == false) && defaulted == false">
+  <ion-label padding class="input-label" color="dark">
+    {{'SEARCH_BY_ADDRESS_' | translate}}
+  </ion-label>
+  <ion-row margin-left margin-right margin-top margin-bottom >
     <ion-col col-12 class="street">
       <ion-input type="text" [placeholder]="'INPUT_LOCATION_STREET' | translate" [(ngModel)]="street" (ionBlur)="streetChanged($event)"></ion-input>
     </ion-col>
   </ion-row>
-  <ion-row margin-left margin-right margin-top margin-bottom *ngIf="(authorized == false || located == false) && defaulted == false">
+  <ion-row margin-left margin-right margin-top margin-bottom >
     <ion-col col-12 class="city">
       <ion-input type="text" [placeholder]="'INPUT_LOCATION_CITY' | translate" [(ngModel)]="city" (ionBlur)="cityChanged($event)"></ion-input>
     </ion-col>
   </ion-row>
-  <ion-row margin-left margin-right margin-bottom *ngIf="(authorized == false || located == false) && defaulted == false">
+  <ion-row margin-left margin-right margin-bottom >
     <ion-col col-6 class="country">
       <ion-select [placeholder]="'INPUT_LOCATION_COUNTRY' | translate" [selectOptions]="countriesOptions" [(ngModel)]="country" (ionChange)="countryChanged($event)">
         <ion-option [value]="_country.name" *ngFor="let _country of countries">{{_country.name}}</ion-option>
@@ -45,7 +48,16 @@
         <ion-option [value]="_province.name" *ngFor="let _province of provinces">{{_province.name}}</ion-option>
       </ion-select>
     </ion-col>
+    <p ion-text color="danger" class="input-error" padding-right *ngIf="geocodingError">
+      {{geocodingError}}
+      </p>
   </ion-row>
+  <button ion-button icon-left text-uppercase margin-left small color="secondary" (click)="geocodeAddress()">
+    <ion-icon name="search"></ion-icon>{{ 'SEARCH' | translate }}
+  </button>
+  <button ion-button icon-left text-uppercase small margin-left color="secondary" *ngIf="authorized===true" (click)="detectLocation()">
+    <ion-icon name="navigate"></ion-icon> {{ "USE_LOCATION" | translate }}
+  </button>
   <ion-card margin-left margin-right *ngIf="map">
     <image-cache full [src]="map"></image-cache>
   </ion-card>