remove conflict markings from file

Author: jyaistMap

guide/05-working-with-the-spatially-enabled-dataframe/spatially-enabled-dataframe-advanced-topics.ipynb

@@ -879,11 +879,7 @@
    "outputs": [],
    "source": [
     "midx.center = [39, -98]\n",
-<<<<<<< HEAD
     "midx.basemap.basemap = 'gray-vector'"
-=======
-    "midx.basemap = \"gray-vector\""
->>>>>>> 6a0310e271c7e1d07fa30792df4a672d93260288
    ]
   },
   {
@@ -972,26 +968,13 @@
     "    miny = child.center[1] - height_factor\n",
     "    maxx = child.center[0] + width_factor\n",
     "    maxy = child.center[1] + height_factor\n",
-<<<<<<< HEAD
     "    child_geom = Geometry({\n",
     "        'rings':[[[minx,miny], [minx, maxy], [maxx, maxy], [maxx, miny], [minx, miny]]],\n",
     "        'spatialReference': sp_ref})\n",
     "    #child_extent = Polygon(child_geom)\n",
     "    \n",
     "    sym = SimpleFillSymbolEsriSFS(**sym)\n",
     "    midx.content.draw(shape = child_geom, symbol = sym)\n",
-=======
-    "    child_geom = Geometry(\n",
-    "        {\n",
-    "            \"rings\": [\n",
-    "                [[minx, miny], [minx, maxy], [maxx, maxy], [maxx, miny], [minx, miny]]\n",
-    "            ],\n",
-    "            \"spatialReference\": sp_ref,\n",
-    "        }\n",
-    "    )\n",
-    "    # child_extent = Polygon(child_geom)\n",
-    "    midx.draw(shape=child_geom, symbol=sym)\n",
->>>>>>> 6a0310e271c7e1d07fa30792df4a672d93260288
     "    time.sleep(2)"
    ]
   },
@@ -1527,7 +1510,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-<<<<<<< HEAD
     "sym_poly = SimpleFillSymbolEsriSFS(**{\n",
     "  \"type\": \"esriSFS\",\n",
     "  \"style\": \"esriSFSSolid\",\n",
@@ -1541,22 +1523,6 @@
     "\n",
     "# draw the dataframe extent with AOI\n",
     "m1.content.draw(shape = df_geoextent_geom, symbol = sym_poly)"
-=======
-    "sym_poly = {\n",
-    "    \"type\": \"esriSFS\",\n",
-    "    \"style\": \"esriSFSSolid\",\n",
-    "    \"color\": [0, 0, 0, 0],  # hollow, no fill\n",
-    "    \"outline\": {\n",
-    "        \"type\": \"esriSLS\",\n",
-    "        \"style\": \"esriSLSSolid\",\n",
-    "        \"color\": [255, 0, 0, 255],  # red border\n",
-    "        \"width\": 3,\n",
-    "    },\n",
-    "}\n",
-    "\n",
-    "# draw the dataframe extent with AOI\n",
-    "m1.draw(shape=df_geoextent_geom, symbol=sym_poly)"
->>>>>>> 6a0310e271c7e1d07fa30792df4a672d93260288
    ]
   },
   {
@@ -1594,7 +1560,6 @@
     "    {\"rings\": area_of_interest_ring, \"spatialReference\": sp_ref}\n",
     ")\n",
     "\n",
-<<<<<<< HEAD
     "sym_poly_aoi = SimpleFillSymbolEsriSFS(**{\n",
     "  \"type\": \"esriSFS\",\n",
     "  \"style\": \"esriSFSSolid\",\n",
@@ -1607,21 +1572,6 @@
     "})\n",
     "\n",
     "m1.content.draw(shape = area_of_interest_geom, symbol = sym_poly_aoi)"
-=======
-    "sym_poly_aoi = {\n",
-    "    \"type\": \"esriSFS\",\n",
-    "    \"style\": \"esriSFSSolid\",\n",
-    "    \"color\": [0, 0, 0, 0],  # hollow, no fill\n",
-    "    \"outline\": {\n",
-    "        \"type\": \"esriSLS\",\n",
-    "        \"style\": \"esriSLSSolid\",\n",
-    "        \"color\": [0, 255, 0, 255],  # green border\n",
-    "        \"width\": 3,\n",
-    "    },\n",
-    "}\n",
-    "\n",
-    "m1.draw(shape=area_of_interest_geom, symbol=sym_poly_aoi)"
->>>>>>> 6a0310e271c7e1d07fa30792df4a672d93260288
    ]
   },
   {
@@ -1929,11 +1879,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-<<<<<<< HEAD
     "m2.content.draw(shape = area_of_interest_geom, symbol = sym_poly_aoi)"
-=======
-    "m2.draw(shape=area_of_interest_geom, symbol=sym_poly_aoi)"
->>>>>>> 6a0310e271c7e1d07fa30792df4a672d93260288
    ]
   },
   {
@@ -1952,7 +1898,6 @@
     "    \"angle\": 0,\n",
     "    \"xoffset\": 0,\n",
     "    \"yoffset\": 0,\n",
-<<<<<<< HEAD
     "    \"outline\": {\n",
     "        \"color\": [255,140,0,255],\n",
     "        \"width\": 1}\n",
@@ -1961,14 +1906,6 @@
     "# draw the AOI that intersects\n",
     "for pt_index in index_of_features:\n",
     "    m2.content.draw(shape = df.iloc[pt_index]['SHAPE'], symbol = pt_sym)  "
-=======
-    "    \"outline\": {\"color\": [255, 140, 0, 255], \"width\": 1},\n",
-    "}\n",
-    "\n",
-    "# draw the AOI that intersects\n",
-    "for pt_index in index_of_features:\n",
-    "    m2.draw(shape=df.iloc[pt_index][\"SHAPE\"], symbol=pt_sym)"
->>>>>>> 6a0310e271c7e1d07fa30792df4a672d93260288
    ]
   },
   {
@@ -4227,11 +4164,7 @@
    "source": [
     "# draw the spatial join results on Wyoming state\n",
     "for idx, row in sdf2.iterrows():\n",
-<<<<<<< HEAD
     "    m3.content.draw(row['SHAPE'], symbol=pt_sym)"
-=======
-    "    m3.draw(row[\"SHAPE\"], symbol=pt_sym)"
->>>>>>> 6a0310e271c7e1d07fa30792df4a672d93260288
    ]
   },
   {