updates from conflict

Author: jyaistMap

guide/01-getting-started/system-requirements.ipynb

@@ -22,35 +22,40 @@
    "metadata": {},
    "source": [
     "## Operating System \n",
-    "The ArcGIS API for Python 2.4.0 release is compatible with 64-bit versions of Windows, macOS, and Linux.\n",
+    "The ArcGIS API for Python 2.4.0 release is compatible with 64-bit versions of Windows, macOS (M-Series and Intel), and Linux.\n",
     "\n",
     "## Python Version\n",
-    "Python 3.10.x to 3.12.x is required to use the ArcGIS API for Python 2.3.1.\n",
+    "Python 3.10.x to 3.12.x is required to use the ArcGIS API for Python 2.3.1 and greater releases.\n",
     "\n",
     "## Dependencies\n",
     "The full power of the ArcGIS API for Python is best experienced when all its dependencies are installed. However, specific tasks such as GIS administration and content management can be accomplished with a subset of dependencies installed. See [Install with minimum Dependencies](../install-and-set-up#install-with-minimum-dependencies) to install the `arcgis` package in this manner.\n",
     "\n",
-    "It is recommended to install the `arcgis` package the default way of either `conda install -c esri arcgis` or `pipenv install arcgis`. When version 2.3.1 is installed in this manner, all the below dependencies are automatically installed. \n",
+    "It is recommended to install the `arcgis` package the default way of either `conda install -c esri arcgis arcgis-mapping` or `pipenv install arcgis arcgis-mapping`. When version 2.4.0 is installed in this manner, all the below dependencies are automatically installed. \n",
     "\n",
     "> __Note__ Most of these packages have dependencies of their own. For a full list of packages installed:\n",
     "  > * conda environment, type `conda list -n <environment_name>`.  \n",
-    "  > * pipenv virtual environment: See [`Pipfile` and `Pipfile.lock`](https://pipenv.pypa.io/en/latest/pipfile/) for details. \n",
+    "  > * pipenv virtual environment: See [`Pipfile` and `Pipfile.lock`](https://pipenv.pypa.io/en/latest/pipfile/) for details.\n",
+    "    \n",
     "\n",
-    "* [pandas>=2.2.0](https://anaconda.org/Esri/pandas) \n",
+    "* [pandas>=2.0.0,<2.2.0](https://anaconda.org/Esri/pandas) \n",
     "* [numpy>=1.21.6,<2](https://anaconda.org/Esri/numpy) \n",
-    "* [pyshp>=2](https://anaconda.org/conda-forge/pyshp/) \n",
+    "* [pyshp>=2,<3](https://anaconda.org/conda-forge/pyshp/)\n",
+    "* [pillow](https://python-pillow.github.io/)\n",
+    "* [certifi](https://github.com/certifi/python-certifi) \n",
     "* [matplotlib](https://anaconda.org/esri/matplotlib)\n",
     "* [matplotlib-inline](https://anaconda.org/anaconda/matplotlib-inline/)\n",
     "* [notebook](https://anaconda.org/esri/notebook)\n",
     "* [ipywidgets >=7,<8](https://anaconda.org/esri/ipywidgets)\n",
     "* [widgetsnbextension >=3](https://anaconda.org/esri/widgetsnbextension)\n",
     "* [keyring>=23.3.0](https://anaconda.org/esri/keyring)\n",
-    "* [urllib3>=1.26.2,<3](https://anaconda.org/conda-forge/urllib3/)\n",
+    "* [urllib3>=1.26.1,<3](https://anaconda.org/conda-forge/urllib3/)\n",
     "* [cachetools](https://anaconda.org/conda-forge/cachetools)\n",
     "* [lxml](https://anaconda.org/esri/lxml)\n",
+    "* [puremagic >=1.15,<2](https://github.com/cdgriffith/puremagic)\n",
     "* [cryptography](https://anaconda.org/esri/cryptography)\n",
     "* [jupyter-client<=6.1.12](https://anaconda.org/conda-forge/jupyter-client/)\n",
     "* [pylerc](https://anaconda.org/esri/pylerc)\n",
+    "* [pyarrow>11.0.0](https://arrow.apache.org/)\n",
     "* [ujson>=3](https://anaconda.org/conda-forge/ujson/)\n",
     "* [geomet](https://anaconda.org/esri/geomet/)\n",
     "* [requests>=2.30.0,<2.32.0](https://anaconda.org/conda-forge/requests/)\n",
@@ -64,25 +69,19 @@
     "* [pyspnego>=0.8.0](https://anaconda.org/conda-forge/pyspnego/)\n",
     "  * Python>=3.10\n",
     "* **Windows only:**\n",
-    "  * [python-certifi-win32](https://anaconda.org/esri/python-certifi-win32/)\n",
-    "    * Python < 3.10\n",
     "  * [pywin32>=223](https://anaconda.org/conda-forge/pywin32/)\n",
+    "    * pywin-security\n",
     "  * [requests-negotiate-sspi](https://anaconda.org/esri/requests-negotiate-sspi/)\n",
     "\n",
+    "> Note: The dependencies above result from installing using `conda`. Versions may vary if `arcgis` is installed using `pip`.\n",
     "\n",
     "> Note: if `arcpy` is found in the current python environment, it may be used in various locations. Otherwise, `pyshp` will be used. See [Spatially Enabled DataFrame](https://developers.arcgis.com/python/api-reference/arcgis.features.toc.html?highlight=geoaccessor#arcgis.features.GeoAccessor) for more information.\n",
     "\n",
+    "\n",
     "### Optional Dependencies\n",
     "\n",
     "There are some other python packages that may be required to use certain functionality in the API, but are __not__ automatically installed. To use that functionality, you must manually call `conda install {package_name}` or `pipenv install {package_name}` for such optional packages."
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
@@ -101,7 +100,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.0"
+   "version": "3.11.11"
   },
   "toc": {
    "base_numbering": 1,

guide/04-feature-data-and-analysis/appending-features.ipynb

@@ -13,7 +13,13 @@
    "source": [
     "Any Web GIS Administrator can attest to the fundamental importance of managing hosted feature layers in ArcGIS online. Traditionally, adding data en masse to existing hosted feature layers typically involved a three-step process of downloading the feature layer data, merging additional edits, and finally overwriting the original feature layer.  While that workflow still suffices in many circumstances, the [`append()`](https://developers.arcgis.com/python/api-reference/arcgis.features.toc.html#arcgis.features.FeatureLayer.append) function greatly simplifies the process.  It can save you a ton of time if your features layers are large, eliminating the time involved in overwriting the feature layer. \n",
     "\n",
-    "Let's take a look at some example `append()` workflows below.  This guide document refers to the feature layer you will append data into as the `target`, while the item you append data from is referred to as the `source`."
+    "Let's take a look at some example `append()` workflows below.  This guide document refers to the feature layer you will append data into as the `target`, while the item you append data from is referred to as the `source`.\n",
+    "\n",
+    "> **Note:** Please see the [Append (Feature Service/Layer)](https://developers.arcgis.com/rest/services-reference/enterprise/append-feature-service-layer/) for technical reference details on the append operation.\n",
+    "\n",
+    "> **Note:** When appending features from files, important criteria must be met in order for the append to succeed, and only certain file formats may be supported for a given layer. Please see the documentation for your deployment before attempting to append data:\n",
+    "> * ArcGIS Online: _Manage hosted feature layers_ - [Add and update features from a file](https://doc.arcgis.com/en/arcgis-online/manage-data/manage-hosted-feature-layers.htm#APPEND)\n",
+    "> * ArcGIS Enteprise: _Manage hosted feature layers_ - [Add and update features from a file](https://enterprise.arcgis.com/en/portal/latest/use/manage-hosted-feature-layers.htm#APPEND)"
    ]
   },
   {
@@ -118,7 +124,7 @@
    "source": [
     "## Append New Features from a File Geodatabase\n",
     "\n",
-    "This first example appends new features from a File Geodatabase into a hosted feature layer. For optimal performance and minimal chance of errors when using [`append()`](https://developers.arcgis.com/python/api-reference/arcgis.features.toc.html#arcgis.features.FeatureLayer.append), Esri strongly recommends the schema for the source file to upload (source) matches the schema of the hosted feature service layer (target).  \n",
+    "This first example appends new features from a File Geodatabase into a hosted feature layer. For optimal performance and minimal chance of errors when using [`append()`](https://developers.arcgis.com/python/api-reference/arcgis.features.toc.html#arcgis.features.FeatureLayer.append), Esri strongly recommends the schema for the source file to upload (source) matches the schema of the hosted feature service layer (target).  Please note that appending from a file geodatabase is only supported in ArcGIS Online.\n",
     "\n",
     "In this first section, you'll have matching schema between your File Geodatabase item (named `SubDiv_PB11_PG48_parcels`) and a hosted feature service layer you will publish."
    ]
@@ -414,7 +420,11 @@
    "metadata": {},
    "source": [
     "### Get the source item for appending\n",
-    "In order for the append workflow to succeed, you need to add the source file containing the new features as an Item in your GIS. In this case, the data file is already uploaded as an Item for you. From there, get the item id value for this file geodatabase item containing features you want to append to the feature layer. In this case, the Schema from the file geodatabase you'll append matches that of the hosted feature layer."
+    "In order for the append workflow to succeed, you need to add the source file containing the new features as an Item in your GIS. In this case, the data file is already uploaded as an Item for you. From there, get the item id value for this file geodatabase item containing features you want to append to the feature layer. In this case, the Schema from the file geodatabase you'll append matches that of the hosted feature layer.\n",
+    "\n",
+    "> **Note:** It is important to verify the Feature Layer you use supports the operation you intend to run.  Please query the feature layer for the following properties to confirm:\n",
+    "> * `FeatureLayer.properties.supportsAppend` - see [Supports append](https://developers.arcgis.com/rest/services-reference/enterprise/append-feature-service-layer/#supports-append) for details.\n",
+    "> * `FeatureLayer.properties.supportedAppendFormats` - see [Supported append formats](https://developers.arcgis.com/rest/services-reference/enterprise/append-feature-service-layer/#supported-append-formats) for details."
    ]
   },
   {
@@ -546,7 +556,6 @@
    "source": [
     "m2 = gis.map(\"Downingtown, PA\")\n",
     "m2.center = [40.0065, -75.7033]\n",
-    "m2.zoom = 14\n",
     "m2"
    ]
   },

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

@@ -2826,6 +2826,13 @@
     "</div>\n"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "> **Note:**  Organizations should review the [data attributions](https://www.esri.com/en-us/legal/terms/data-attributions) and [Master Agreement](https://www.esri.com/content/dam/esrisites/en-us/media/legal/ma-full/ma-full.pdf) to make sure they are in compliance when geoenriching data and making it available to other systems."
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 51,

guide/05-working-with-the-spatially-enabled-dataframe/visualizing-data-with-the-spatially-enabled-dataframe.ipynb

@@ -1407,6 +1407,34 @@
     "county_sdf.spatial.plot(map_widget=m9)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Add Popup Field Info"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Finally, we can add field information from the dataframe to the popup for it to display on the map when a user clicks on a specific county."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from arcgis.map.dataclasses.models import FieldInfo\n",
+    "\n",
+    "pu = m9.content.popup(0)\n",
+    "pu.disable_popup = False\n",
+    "fields = [FieldInfo(field_name=fld) for fld in county_sdf.columns]\n",
+    "pu.edit(\"County Data\", field_infos=fields)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},

guide/12-enrich-data-with-thematic-information/part1_introduction_to_geoenrichment.ipynb

@@ -20,6 +20,13 @@
     "The GeoEnrichment module provides a python interface for access the demographic data provided through Business Analyst to enrich study areas, access standard geographies, and create reports. Accessing standard geographies enables retrieving and enriching standard jurisdictional areas such as counties, postal (zip) codes or US Census Block Groups in the United States."
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "> **Note:** Organizations should review the [data attributions](https://www.esri.com/en-us/legal/terms/data-attributions) and [Master Agreement](https://www.esri.com/content/dam/esrisites/en-us/media/legal/ma-full/ma-full.pdf) to make sure they are in compliance when geoenriching data and making it available to other systems."
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -1492,7 +1499,7 @@
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -1506,7 +1513,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.11"
+   "version": "3.11.0"
   },
   "livereveal": {
    "scroll": true