add conditions for Shuangs edge case

Author: CMPeng

samples/04_gis_analysts_data_scientists/finding_a_new_home.ipynb

@@ -4611,12 +4611,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "cur_field_name = \"ForecastYoYPctChange\"\n",
+    "cur_field_name2 = \"ForecastYoYPctChange\"\n",
     "if has_arcpy:\n",
-    "    if cur_field_name not in hlth_lyr.layers[0].properties.fields:\n",
-    "        cur_field_name = \"forecase_yo_y_pct_change\"\n",
+    "    if cur_field_name2 not in hlth_lyr.layers[0].properties.fields:\n",
+    "        cur_field_name2 = \"forecast_yo_y_pct_change\"\n",
     "else:\n",
-    "    cur_field_name = \"ForecastYo\""
+    "    cur_field_name2 = \"ForecastYo\""
    ]
   },
   {
@@ -4626,7 +4626,7 @@
    "outputs": [],
    "source": [
     "m7.add_layer(hlth_lyr, {\"renderer\":\"ClassedColorRenderer\",\n",
-    "                        \"field_name\":cur_field_name,\n",
+    "                        \"field_name\":cur_field_name2,\n",
     "                        \"classificationMethod\":'quantile',\n",
     "                        \"opacity\":0.7\n",
     "              })\n",
@@ -4975,10 +4975,9 @@
     }
    ],
    "source": [
-    "if has_arcpy:\n",
-    "    zip_hlth_intersect_df = zip_hlth_intersect.query(where='((ZHVI > 350000) AND (ZHVI < 600000) AND (MarketHealthIndex > 8) AND (ForecastYoYPctChange> 0.06)) AND (1=1)').sdf\n",
-    "else:\n",
-    "    zip_hlth_intersect_df = zip_hlth_intersect.query(where='((ZHVI > 350000) AND (ZHVI < 600000) AND (MarketHeal > 8) AND (ForecastYo> 0.06)) AND (1=1)').sdf\n",
+    "query_str = '((ZHVI > 350000) AND (ZHVI < 600000) AND (' + cur_field_name + ' > 8) AND (' + cur_field_name2 + '> 0.06)) AND (1=1)'\n",
+    "\n",
+    "zip_hlth_intersect_df = zip_hlth_intersect.query(where=query_str).sdf\n",
     "zip_hlth_intersect_df"
    ]
   },
@@ -5014,14 +5013,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "if has_arcpy:\n",
-    "    m9.add_layer(zip_hlth_intersect,\n",
-    "             {\"definition_expression\": '((ZHVI > 350000) AND (ZHVI < 600000) AND (MarketHealthIndex > 8) AND (ForecastYoYPctChange > 0.06)) AND (1=1)',\n",
+    "m9.add_layer(zip_hlth_intersect,\n",
+    "             {\"definition_expression\": query_str,\n",
     "             \"classificationMethod\":'quantile'})\n",
-    "else:\n",
-    "    m9.add_layer(zip_hlth_intersect,\n",
-    "             {\"definition_expression\": '((ZHVI > 350000) AND (ZHVI < 600000) AND (MarketHeal > 8) AND (ForecastYo> 0.06)) AND (1=1)',\n",
-    "              \"classificationMethod\":'quantile'})\n",
     "m9.zoom_to_layer(zip_hlth_intersect)"
    ]
   },