Skip to content

Commit

Permalink
updated v0.3.9
Browse files Browse the repository at this point in the history
- Removed deprecated bundles from bundles list.
- Improved parameter description
  • Loading branch information
samapriya committed Aug 3, 2019
1 parent df2ad0f commit e8e0c42
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 181 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,9 @@ A simple setup would be

## Changelog

### v0.3.9
- Removed deprecated bundles from bundles list.

### v0.3.7
- Added capability to pass subscription id when submitting order.

Expand Down
Binary file removed dist/porder-0.3.8.tar.gz
Binary file not shown.
Binary file not shown.
Binary file added dist/porder-0.3.9.tar.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion porder/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

__author__ = 'Samapriya Roy'
__email__ = '[email protected]'
__version__ = '0.3.8'
__version__ = '0.3.9'
174 changes: 0 additions & 174 deletions porder/bundles.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,33 +63,6 @@
"PSScene4Band": ["analytic", "analytic_xml", "udm", "udm2"]
}
},
"analytic_dn": {
"name": "Uncalibrated DN",
"description": "This product bundle is deprecated, please use 'uncalibrated_dn' instead",
"assets": {
"PSOrthoTile": ["analytic_dn", "analytic_dn_xml", "udm"],
"PSScene3Band": ["analytic_dn", "analytic_dn_xml", "udm"],
"PSScene4Band": ["analytic_dn", "analytic_dn_xml", "udm"]
}
},
"analytic_nitf": {
"name": "Non-Orthorectified Analytic Radiance NITF",
"description": "This product bundle is deprecated, please use 'basic_analytic_nitf' instead",
"assets": {
"REScene": [
"basic_analytic_b1_nitf",
"basic_analytic_b2_nitf",
"basic_analytic_b3_nitf",
"basic_analytic_b4_nitf",
"basic_analytic_b5_nitf",
"basic_analytic_rpc",
"basic_analytic_sci",
"basic_analytic_xml_nitf",
"basic_udm",
"browse"
]
}
},
"visual": {
"name": "Visual",
"description": "Orthorectified product, visually enhanced for optimal appearance",
Expand Down Expand Up @@ -165,37 +138,6 @@
]
}
},
"basic_analytic_dn": {
"name": "Non-Orthorectified, Uncalibrated DN",
"description": "This product bundle is deprecated, please use 'basic_uncalibrated_dn' instead",
"assets": {
"PSScene3Band": [
"basic_analytic_dn",
"basic_analytic_dn_rpc",
"basic_analytic_dn_xml",
"basic_udm"
],
"PSScene4Band": [
"basic_analytic_dn",
"basic_analytic_dn_xml",
"basic_analytic_rpc",
"basic_udm"
],
"SkySatScene": ["basic_analytic_dn", "basic_analytic_dn_rpc"]
}
},
"basic_analytic_dn_nitf": {
"name": "Non-Orthorectified, Uncalibrated DN NITF",
"description": "This product bundle is deprecated, please use 'basic_uncalibrated_dn_nitf' instead",
"assets": {
"PSScene4Band": [
"basic_analytic_dn_nitf",
"basic_analytic_dn_rpc_nitf",
"basic_analytic_dn_xml_nitf",
"basic_udm"
]
}
},
"basic_uncalibrated_dn": {
"name": "Non-Orthorectified, Uncalibrated DN",
"description": "Non-orthorectified, non-radiometrically-calibrated, raw digital number",
Expand Down Expand Up @@ -379,34 +321,6 @@
"SkySatScene": ["basic_panchromatic_dn", "basic_panchromatic_dn_rpc"]
}
},
"ortho_analytic_dn": {
"name": "Uncalibrated DN",
"description": "This product bundle is deprecated, please use 'uncalibrated_dn' instead",
"assets": {
"SkySatScene": ["ortho_analytic_dn", "ortho_analytic_udm"]
}
},
"ortho_panchromatic_dn": {
"name": "Panchromatic DN",
"description": "This product bundle is deprecated, please use 'panchromatic_dn' instead",
"assets": {
"SkySatScene": ["ortho_panchromatic_dn", "ortho_panchromatic_udm"]
}
},
"ortho_pansharpened": {
"name": "Pansharpened",
"description": "This product bundle is deprecated, please use 'pansharpened' instead",
"assets": {
"SkySatScene": ["ortho_pansharpened", "ortho_pansharpened_udm"]
}
},
"ortho_visual": {
"name": "Visual",
"description": "This product bundle is deprecated, please use 'visual' instead",
"assets": {
"SkySatScene": ["ortho_analytic_udm", "ortho_visual"]
}
},
"panchromatic_dn": {
"name": "Panchromatic DN",
"description": "Orthorectified panchromatic imagery, non-radiometrically calibrated, raw digital number",
Expand Down Expand Up @@ -743,93 +657,5 @@
}
}
},
"deprecated": {
"analytic": {
"assets": {
"REScene": [
"basic_analytic_b1",
"basic_analytic_b2",
"basic_analytic_b3",
"basic_analytic_b4",
"basic_analytic_b5",
"basic_analytic_xml",
"basic_analytic_rpc",
"basic_udm",
"basic_analytic_sci",
"browse"
]
}
},
"analytic_dn": {
"assets": {
"PSOrthoTile": ["analytic_dn", "analytic_dn_xml", "udm"],
"PSScene3Band": ["analytic_dn", "analytic_dn_xml", "udm"],
"PSScene4Band": ["analytic_dn", "analytic_dn_xml", "udm"]
}
},
"analytic_nitf": {
"assets": {
"REScene": [
"basic_analytic_b1_nitf",
"basic_analytic_b2_nitf",
"basic_analytic_b3_nitf",
"basic_analytic_b4_nitf",
"basic_analytic_b5_nitf",
"basic_analytic_rpc",
"basic_analytic_sci",
"basic_analytic_xml_nitf",
"basic_udm",
"browse"
]
}
},
"basic_analytic_dn": {
"assets": {
"PSScene3Band": [
"basic_analytic_dn",
"basic_analytic_dn_rpc",
"basic_analytic_dn_xml",
"basic_udm"
],
"PSScene4Band": [
"basic_analytic_dn",
"basic_analytic_dn_xml",
"basic_analytic_rpc",
"basic_udm"
],
"SkySatScene": ["basic_analytic_dn", "basic_analytic_dn_rpc"]
}
},
"basic_analytic_dn_nitf": {
"assets": {
"PSScene4Band": [
"basic_analytic_dn_nitf",
"basic_analytic_dn_rpc_nitf",
"basic_analytic_dn_xml_nitf",
"basic_udm"
]
}
},
"ortho_analytic_dn": {
"assets": {
"SkySatScene": ["ortho_analytic_dn", "ortho_analytic_udm"]
}
},
"ortho_panchromatic_dn": {
"assets": {
"SkySatScene": ["ortho_panchromatic_dn", "ortho_panchromatic_udm"]
}
},
"ortho_pansharpened": {
"assets": {
"SkySatScene": ["ortho_pansharpened", "ortho_pansharpened_udm"]
}
},
"ortho_visual": {
"assets": {
"SkySatScene": ["ortho_analytic_udm", "ortho_visual"]
}
}
},
"version": "2019-03-08"
}
10 changes: 5 additions & 5 deletions porder/porder.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,11 @@ def main(args=None):
required_named.add_argument('--asset', help='Asset Type analytic, analytic_sr,visual etc', default=None)
required_named.add_argument('--outfile', help='Output csv file', required=True)
optional_named = parser_idlist.add_argument_group('Optional named arguments')
optional_named.add_argument('--cmin', help="Minimum cloud cover", default=None)
optional_named.add_argument('--cmax', help="Maximum cloud cover", default=None)
optional_named.add_argument('--cmin', help="Minimum cloud cover 0-1 represents 0 to 100", default=None)
optional_named.add_argument('--cmax', help="Maximum cloud cover 0-1 represents 0 to 100", default=None)
optional_named.add_argument('--number', help="Total number of assets, give a large number if you are not sure", default=None)
optional_named.add_argument('--overlap', help="Percentage overlap of image with search area range between 0 to 100", default=None)
optional_named.add_argument('--filters', nargs='+',help="Add an additional string or range filter", default=None)
optional_named.add_argument('--filters', nargs='+',help="Add an additional string or range filter, Read Me", default=None)
parser_idlist.set_defaults(func=idlist_from_parser)

parser_difflist = subparsers.add_parser('difflist', help='Checks the difference between local files and available Planet assets')
Expand All @@ -287,8 +287,8 @@ def main(args=None):
required_named.add_argument('--end', help='End Date YYYY-MM-DD', required=True)
required_named.add_argument('--outfile', help='Full path to CSV file with difference ID list', required=True)
optional_named = parser_difflist.add_argument_group('Optional named arguments')
optional_named.add_argument('--cmin', help="Minimum cloud cover")
optional_named.add_argument('--cmax',help="Maximum cloud cover")
optional_named.add_argument('--cmin', help="Minimum cloud cover 0-1 represents 0 to 100")
optional_named.add_argument('--cmax',help="Maximum cloud cover 0-1 represents 0 to 100")
parser_difflist.set_defaults(func=difflist_from_parser)

parser_idsplit = subparsers.add_parser('idsplit',help='Splits ID list incase you want to run them in small batches')
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def readme():
return f.read()
setuptools.setup(
name='porder',
version='0.3.8',
version='0.3.9',
packages=['porder'],
url='https://github.com/samapriya/porder',
package_data={'': ['bundles.json']},
Expand Down

0 comments on commit e8e0c42

Please sign in to comment.