muba-posting 6.0.15 → 6.0.17

package/Publish2.js

@@ -18,6 +18,7 @@ export default class Publish2 extends React.Component {
     super(props);
 
     this.state = {
+      movedMapPointer: false,
       latitude: props.postingAd.latitude,
       longitude: props.postingAd.longitude,
       zoom: props.postingAd.latitude != null && props.postingAd.longitude != null ? 15 : 9,
@@ -25,8 +26,14 @@ export default class Publish2 extends React.Component {
     }
   }
 
+  componentDidMount() {
+    if (this.props.postingAd.id == null) {
+      this.props.postingAd.exactlyLocated = false;
+    }
+  }
+
   async nextStep() {
-    if (await this.validateLocation()) {
+    if ((this.props.postingAd.exactlyLocated && !this.state.movedMapPointer) || await this.validateLocation()) {
       const responseCheckZone = await this.props.request(this.props.context, GET_CHECK_ZONE, {
         businessId: this.props.businessId,
         cityId: this.props.postingAd.city
@@ -57,11 +64,12 @@ export default class Publish2 extends React.Component {
     });
 
     if (responseJson.httpStatus === 200) {
-      if (responseJson.exactlyLocated) {
-        this.props.postingAd.exactlyLocated = true;
-        validateLocation = true;
-      } else {
+      validateLocation = responseJson.exactlyLocated;
+
+      if (responseJson.country == null || responseJson.country !== this.props.postingAd.country) {
         this.props.postingAd.exactlyLocated = false;
+        this.props.postingAd.latitude = null;
+        this.props.postingAd.longitude = null;
       }
 
       if (responseJson.region !== undefined) {
@@ -94,6 +102,7 @@ export default class Publish2 extends React.Component {
   }
 
   _changeMapLocation(region) {
+    this.props.postingAd.exactlyLocated = this.props.postingAd.exactlyLocated || this.state.movedMapPointer;
     this.props.postingAd.latitude = region.latitude;
     this.props.postingAd.longitude = region.longitude;
     this.props.postingAd.zoom = region.zoom;
@@ -115,6 +124,7 @@ export default class Publish2 extends React.Component {
           request={this.props.request}
           context={this.props.context}
           baseUrl={this.props.baseUrl}
+          locationChange={() => this.setState({ movedMapPointer: true })}
           onMapReady={() => this.props.hideLoading()} />
         <View style={commonStyles.buttomButton} onLayout={this.onLayout}>
           <TouchableHighlight style={commonStyles.actionButton} underlayColor="#ff5d00" onPress={() => this.nextStep()}>

package/Publish2b.js

@@ -34,7 +34,11 @@ export default class Publish2b extends React.Component {
         elements: [{ section: true, value: null, label: strings('setup.town') }],
         selectedItem: this.props.postingAd.town
       },
-      address: this.props.postingAd.address
+      address: this.props.postingAd.address,
+      originalRegion: this.props.postingAd.region,
+      originalCity: this.props.postingAd.city,
+      originalDistrict: this.props.postingAd.district,
+      originalTown: this.props.postingAd.town
     };
   }
 
@@ -162,7 +166,7 @@ export default class Publish2b extends React.Component {
     }
   }
 
-  validateForm() {
+  async validateForm() {
     var validate = true;
 
     validate = this.inputSelectTown.onSubmitValidate() && validate;
@@ -170,6 +174,18 @@ export default class Publish2b extends React.Component {
     validate = this.inputSelecCity.onSubmitValidate() && validate;
     validate = this.inputSelectRegion.onSubmitValidate() && validate;
 
+    if (this.props.postingAd.exactlyLocated) {
+      let keepsExactlyLocated = (this.state.originalRegion == null || this.state.originalRegion === this.props.postingAd.region)
+        && (this.state.originalCity == null || this.state.originalCity === this.props.postingAd.city)
+        && (this.state.originalDistrict == null || this.state.originalDistrict === this.props.postingAd.district)
+        && (this.state.originalTown == null || this.state.originalTown === this.props.postingAd.town);
+      this.props.postingAd.exactlyLocated = keepsExactlyLocated;
+      if (!keepsExactlyLocated) {
+        this.props.postingAd.latitude = null;
+        this.props.postingAd.longitude = null;
+      }
+    }
+
     return validate;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "6.0.15",
+  "version": "6.0.17",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {