Shorten geo predicates

[rjyounes]

Some of us think the shift to more explicit, but longer, predicates in gist 11 was overkill. The proposal is to go back to something like (without inverses, which are eliminated in #506):

• geoContains
• geoOccupies
• geoOccupiesPermanently

However, the occupies predicates are considered for removal in issue #809.

[rjyounes]

I also noted that we use "geo" in the class names: GeoPoint, GeoRegion, etc., so it actually seems odd to use the full word for the properties.

[uscholdm]

'geoContains' has been removed. We now use isGeographicallyContainedIn. So presumably, the proposal is to

• rename isGeographicallyContainedIn to isGeoContainedIn

I think it is a reasonable proposal. One downside is the risk of our flip-flopping too much with name changes for tidiness reasons resulting in major releases. It could be a nuisance to our users.

[rjyounes]

Yes, that's the proposal. I realize the flip-flopping is unappealing, but we provide migration scripts with major versions to ease the burden of renaming.

[rjyounes]

Also remove the occupies predicates as per issue #809, now captured in #947 (comment).