Strictly, seamark:terminal:goods= should be used on the =terminal . All the =berth will use seamark:berth:goods= .
Also, the =berth will be directly on the perimeter. Eventually, they could also be drawn as areas. which would exist on waters outside the land of =terminal (the new inland waters standard) / =harbour (existing confusion) / =harbour_facility (if we don’t want to follow inland standard yet) . To enclose both, the international standard is hrbare hypothetically =harbour_area , however it has no cargo info directly (likely because a “harbor” can have multiple =terminal , and handle different cargo).